diff --git a/.pick_status.json b/.pick_status.json
index ff878d6c0de..f4d55a0ec1b 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -7394,7 +7394,7 @@
         "description": "zink: correctly handle batch_id==0 in check_last_finished()",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/gallium/drivers/zink/zink_screen.h b/src/gallium/drivers/zink/zink_screen.h
index 45be34c94fc..a8e03ebc972 100644
--- a/src/gallium/drivers/zink/zink_screen.h
+++ b/src/gallium/drivers/zink/zink_screen.h
@@ -61,7 +61,9 @@ static inline bool
 zink_screen_check_last_finished(struct zink_screen *screen, uint32_t batch_id)
 {
    const uint32_t check_id = (uint32_t)batch_id;
-   assert(check_id);
+   /* 0 means an in-flight batch */
+   if (check_id == 0)
+      return false;
    /* last_finished may have wrapped */
    if (screen->last_finished < UINT_MAX / 2) {
       /* last_finished has wrapped, batch_id has not */