diff --git a/.pick_status.json b/.pick_status.json
index 73b286ee622..a89ca9ea15c 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -124,7 +124,7 @@
         "description": "pvr: skip emitting query program when copy result / reset with 0 queries",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "0aa9f32b95e6d05a7b9ccd737dba14df785159c7",
         "notes": null
diff --git a/src/imagination/vulkan/pvr_arch_cmd_query.c b/src/imagination/vulkan/pvr_arch_cmd_query.c
index 36bc1fd3781..139089a60b4 100644
--- a/src/imagination/vulkan/pvr_arch_cmd_query.c
+++ b/src/imagination/vulkan/pvr_arch_cmd_query.c
@@ -22,6 +22,9 @@ void PVR_PER_ARCH(CmdResetQueryPool)(VkCommandBuffer commandBuffer,
 
    PVR_CHECK_COMMAND_BUFFER_BUILDING_STATE(cmd_buffer);
 
+   if (queryCount == 0)
+      return;
+
    query_info.type = PVR_QUERY_TYPE_RESET_QUERY_POOL;
 
    query_info.reset_query_pool.query_pool = queryPool;
@@ -81,6 +84,9 @@ void PVR_PER_ARCH(CmdCopyQueryPoolResults)(VkCommandBuffer commandBuffer,
 
    PVR_CHECK_COMMAND_BUFFER_BUILDING_STATE(cmd_buffer);
 
+   if (queryCount == 0)
+      return;
+
    query_info.type = PVR_QUERY_TYPE_COPY_QUERY_RESULTS;
 
    query_info.copy_query_results.query_pool = queryPool;