diff --git a/.pick_status.json b/.pick_status.json
index 78403192db1..55ea367b9ca 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -3194,7 +3194,7 @@
         "description": "pvr: wait for graphics jobs in CopyQueryPoolResults",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "24b1e3946cc7e679a31aa07bd731464c900c1df7",
         "notes": null
diff --git a/src/imagination/vulkan/pvr_arch_cmd_query.c b/src/imagination/vulkan/pvr_arch_cmd_query.c
index 139089a60b4..308a9fc42ed 100644
--- a/src/imagination/vulkan/pvr_arch_cmd_query.c
+++ b/src/imagination/vulkan/pvr_arch_cmd_query.c
@@ -118,7 +118,7 @@ void PVR_PER_ARCH(CmdCopyQueryPoolResults)(VkCommandBuffer commandBuffer,
    cmd_buffer->state.current_sub_cmd->event = (struct pvr_sub_cmd_event){
       .type = PVR_EVENT_TYPE_BARRIER,
       .barrier = {
-         .wait_for_stage_mask = PVR_PIPELINE_STAGE_TRANSFER_BIT,
+         .wait_for_stage_mask = PVR_PIPELINE_STAGE_ALL_GRAPHICS_BITS | PVR_PIPELINE_STAGE_TRANSFER_BIT,
          .wait_at_stage_mask = PVR_PIPELINE_STAGE_QUERY_BIT,
       },
    };
@@ -138,7 +138,7 @@ void PVR_PER_ARCH(CmdCopyQueryPoolResults)(VkCommandBuffer commandBuffer,
       .type = PVR_EVENT_TYPE_BARRIER,
       .barrier = {
          .wait_for_stage_mask = PVR_PIPELINE_STAGE_QUERY_BIT,
-         .wait_at_stage_mask = PVR_PIPELINE_STAGE_TRANSFER_BIT,
+         .wait_at_stage_mask = PVR_PIPELINE_STAGE_ALL_GRAPHICS_BITS | PVR_PIPELINE_STAGE_TRANSFER_BIT,
       },
    };
 }