diff --git a/.pick_status.json b/.pick_status.json
index 30cfe61e5bc..e48acde4346 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -6464,7 +6464,7 @@
         "description": "anv: fix check on pipeline mode to track buffer writes",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "455a13fb7f170b0f4a55375ec3a6f006fc69f078",
         "notes": null
diff --git a/src/intel/vulkan/anv_blorp.c b/src/intel/vulkan/anv_blorp.c
index 7d52523275d..fa94f1e5b4a 100644
--- a/src/intel/vulkan/anv_blorp.c
+++ b/src/intel/vulkan/anv_blorp.c
@@ -796,8 +796,12 @@ anv_add_buffer_write_pending_bits(struct anv_cmd_buffer *cmd_buffer,
 {
    const struct intel_device_info *devinfo = cmd_buffer->device->info;
 
+   if (anv_cmd_buffer_is_blitter_queue(cmd_buffer))
+      return;
+
    cmd_buffer->state.queries.buffer_write_bits |=
-      (cmd_buffer->queue_family->queueFlags & VK_QUEUE_GRAPHICS_BIT) == 0 ?
+      (cmd_buffer->state.current_pipeline ==
+       cmd_buffer->device->physical->gpgpu_pipeline_value) ?
       ANV_QUERY_COMPUTE_WRITES_PENDING_BITS :
       ANV_QUERY_RENDER_TARGET_WRITES_PENDING_BITS(devinfo);
 }