diff --git a/.pick_status.json b/.pick_status.json
index e8a688801a6..c76e5e491fe 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -4924,7 +4924,7 @@
         "description": "pvr: only specially handle gfx subcmd for BeginQuery",
         "nominated": true,
         "nomination_type": 4,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/imagination/vulkan/pvr_arch_cmd_query.c b/src/imagination/vulkan/pvr_arch_cmd_query.c
index 334ea1014c9..36bc1fd3781 100644
--- a/src/imagination/vulkan/pvr_arch_cmd_query.c
+++ b/src/imagination/vulkan/pvr_arch_cmd_query.c
@@ -170,9 +170,8 @@ void PVR_PER_ARCH(CmdBeginQuery)(VkCommandBuffer commandBuffer,
    /* Occlusion queries can't be nested. */
    assert(!state->vis_test_enabled);
 
-   if (state->current_sub_cmd) {
-      assert(state->current_sub_cmd->type == PVR_SUB_CMD_TYPE_GRAPHICS);
-
+   if (state->current_sub_cmd &&
+       state->current_sub_cmd->type == PVR_SUB_CMD_TYPE_GRAPHICS) {
       if (!state->current_sub_cmd->gfx.query_pool) {
          state->current_sub_cmd->gfx.query_pool = pool;
       } else if (state->current_sub_cmd->gfx.query_pool != pool) {