diff --git a/.pick_status.json b/.pick_status.json
index c5f1c45c7ab..c18cc3b5197 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -6814,7 +6814,7 @@
         "description": "radv: Always call si_emit_cache_flush before writing timestamps",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/amd/vulkan/radv_query.c b/src/amd/vulkan/radv_query.c
index 530e6454b19..69c8a6a7d02 100644
--- a/src/amd/vulkan/radv_query.c
+++ b/src/amd/vulkan/radv_query.c
@@ -2107,7 +2107,7 @@ radv_CmdWriteTimestamp2(VkCommandBuffer commandBuffer, VkPipelineStageFlags2 sta
 
    radv_cs_add_buffer(cmd_buffer->device->ws, cs, pool->bo);
 
-   emit_query_flush(cmd_buffer, pool);
+   si_emit_cache_flush(cmd_buffer);
 
    int num_queries = 1;
    if (cmd_buffer->state.render.view_mask)