diff --git a/.pick_status.json b/.pick_status.json
index af214124ec6..e8ba8b9957b 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1404,7 +1404,7 @@
         "description": "nvk: Enable ZPASS_PIXEL_COUNT in draw_state_init()",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "052bbd65c9a48b2dba363058c7c289f24a1ad265",
         "notes": null
diff --git a/src/nouveau/vulkan/nvk_cmd_draw.c b/src/nouveau/vulkan/nvk_cmd_draw.c
index 76d47c793ce..810776a3fbc 100644
--- a/src/nouveau/vulkan/nvk_cmd_draw.c
+++ b/src/nouveau/vulkan/nvk_cmd_draw.c
@@ -385,6 +385,9 @@ nvk_push_draw_state_init(struct nvk_queue *queue, struct nv_push *p)
       .output7 = OUTPUT7_FALSE,
    });
 
+   /* The blob driver just always leaves this on. */
+   P_IMMD(p, NV9097, SET_ZPASS_PIXEL_COUNT, ENABLE_TRUE);
+
    P_IMMD(p, NV9097, SET_POINT_SIZE, fui(1.0));
    P_IMMD(p, NV9097, SET_ATTRIBUTE_POINT_SIZE, { .enable = ENABLE_TRUE });
 
diff --git a/src/nouveau/vulkan/nvk_query_pool.c b/src/nouveau/vulkan/nvk_query_pool.c
index a3d43503fd6..7082d95dc96 100644
--- a/src/nouveau/vulkan/nvk_query_pool.c
+++ b/src/nouveau/vulkan/nvk_query_pool.c
@@ -469,9 +469,7 @@ nvk_cmd_begin_end_query(struct nvk_cmd_buffer *cmd,
    struct nv_push *p;
    switch (pool->vk.query_type) {
    case VK_QUERY_TYPE_OCCLUSION:
-      p = nvk_cmd_buffer_push(cmd, 7 + end_size);
-
-      P_IMMD(p, NV9097, SET_ZPASS_PIXEL_COUNT, !end);
+      p = nvk_cmd_buffer_push(cmd, 5 + end_size);
 
       P_MTHD(p, NV9097, SET_REPORT_SEMAPHORE_A);
       P_NV9097_SET_REPORT_SEMAPHORE_A(p, report_addr >> 32);