diff --git a/src/gallium/drivers/crocus/crocus_query.c b/src/gallium/drivers/crocus/crocus_query.c
index d614cf678b5..47114cc6e60 100644
--- a/src/gallium/drivers/crocus/crocus_query.c
+++ b/src/gallium/drivers/crocus/crocus_query.c
@@ -676,8 +676,8 @@ crocus_get_query_result(struct pipe_context *ctx,
       }
       assert(READ_ONCE(q->map->snapshots_landed));
 #else
-      if (wait)
-         crocus_wait_syncobj(ctx->screen, q->syncobj, INT64_MAX);
+      if (crocus_wait_syncobj(ctx->screen, q->syncobj, wait ? INT64_MAX : 0))
+         return false;
 #endif
       calculate_result_on_cpu(devinfo, q);
    }