diff --git a/src/gallium/drivers/zink/zink_query.c b/src/gallium/drivers/zink/zink_query.c
index 89c02a7f27b..08b3723a4f4 100644
--- a/src/gallium/drivers/zink/zink_query.c
+++ b/src/gallium/drivers/zink/zink_query.c
@@ -784,7 +784,10 @@ zink_get_query_result(struct pipe_context *pctx,
          pctx->flush(pctx, NULL, 0);
       if (!wait)
          return false;
-   }
+   } else if (!threaded_query(q)->flushed &&
+              /* timeline drivers can wait during buffer map */
+              !zink_screen(pctx->screen)->info.have_KHR_timeline_semaphore)
+      zink_batch_usage_check_completion(ctx, query->batch_id);
 
    return get_query_result(pctx, q, wait, result);
 }