diff --git a/.pick_status.json b/.pick_status.json
index 7846a73dc18..130f562b6f3 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1554,7 +1554,7 @@
         "description": "rusticl/queue: fix error code for invalid queue properties part 1",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/gallium/frontends/rusticl/api/queue.rs b/src/gallium/frontends/rusticl/api/queue.rs
index fb38fa9c768..04327f523b0 100644
--- a/src/gallium/frontends/rusticl/api/queue.rs
+++ b/src/gallium/frontends/rusticl/api/queue.rs
@@ -135,7 +135,7 @@ fn create_command_queue_with_properties(
     let d = Device::ref_from_raw(device)?;
 
     // SAFETY: properties is a 0 terminated array by spec.
-    let properties = unsafe { Properties::new(properties) }.ok_or(CL_INVALID_PROPERTY)?;
+    let properties = unsafe { Properties::new(properties) }.ok_or(CL_INVALID_VALUE)?;
     for (&key, &val) in properties.iter() {
         match u32::try_from(key).or(Err(CL_INVALID_PROPERTY))? {
             CL_QUEUE_PROPERTIES => queue_properties = val,
@@ -152,7 +152,7 @@ fn create_command_queue_with_properties(
             // CL_INVALID_QUEUE_PROPERTIES if values specified in properties are valid but are not
             // supported by the device.
             CL_QUEUE_SIZE => return Err(CL_INVALID_QUEUE_PROPERTIES),
-            _ => return Err(CL_INVALID_PROPERTY),
+            _ => return Err(CL_INVALID_VALUE),
         }
     }