diff --git a/.pick_status.json b/.pick_status.json
index 3d2f0426a99..9a1d0de480f 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2488,7 +2488,7 @@
         "description": "radv: Always flush before writing acceleration structure properties",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/amd/vulkan/radv_query.c b/src/amd/vulkan/radv_query.c
index 5be9a0e1716..abea2590e65 100644
--- a/src/amd/vulkan/radv_query.c
+++ b/src/amd/vulkan/radv_query.c
@@ -2213,7 +2213,7 @@ radv_CmdWriteAccelerationStructuresPropertiesKHR(
 
    radv_cs_add_buffer(cmd_buffer->device->ws, cs, pool->bo);
 
-   emit_query_flush(cmd_buffer, pool);
+   si_emit_cache_flush(cmd_buffer);
 
    ASSERTED unsigned cdw_max =
       radeon_check_space(cmd_buffer->device->ws, cs, 6 * accelerationStructureCount);