diff --git a/.pick_status.json b/.pick_status.json
index f5e2e44924f..d1bfcc37950 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -6714,7 +6714,7 @@
         "description": "u/draw: skip zero-sized indirect draws",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/gallium/auxiliary/util/u_draw.c b/src/gallium/auxiliary/util/u_draw.c
index cd120405ea5..aac16c0f41e 100644
--- a/src/gallium/auxiliary/util/u_draw.c
+++ b/src/gallium/auxiliary/util/u_draw.c
@@ -223,6 +223,9 @@ util_draw_indirect(struct pipe_context *pipe,
       pipe_buffer_unmap(pipe, dc_transfer);
    }
 
+   if (!draw_count)
+      return;
+
    if (indirect->stride)
       num_params = MIN2(indirect->stride / 4, num_params);
    params = (uint32_t *)