diff --git a/.pick_status.json b/.pick_status.json
index c5fedf38444..f495786d370 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -14,7 +14,7 @@
         "description": "iris: Don't search the exec list if BOs have never been added to one",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/gallium/drivers/iris/iris_batch.c b/src/gallium/drivers/iris/iris_batch.c
index d1f75a5981d..293a3b8951d 100644
--- a/src/gallium/drivers/iris/iris_batch.c
+++ b/src/gallium/drivers/iris/iris_batch.c
@@ -278,6 +278,9 @@ find_exec_index(struct iris_batch *batch, struct iris_bo *bo)
 {
    unsigned index = READ_ONCE(bo->index);
 
+   if (index == -1)
+      return -1;
+
    if (index < batch->exec_count && batch->exec_bos[index] == bo)
       return index;