diff --git a/src/gallium/frontends/rusticl/core/queue.rs b/src/gallium/frontends/rusticl/core/queue.rs
index d60c8423a8d..8605f909643 100644
--- a/src/gallium/frontends/rusticl/core/queue.rs
+++ b/src/gallium/frontends/rusticl/core/queue.rs
@@ -466,11 +466,8 @@ impl Queue {
 
 impl Drop for Queue {
     fn drop(&mut self) {
-        // when deleting the application side object, we have to flush
-        // From the OpenCL spec:
-        // clReleaseCommandQueue performs an implicit flush to issue any previously queued OpenCL
-        // commands in command_queue.
-        // TODO: maybe we have to do it on every release?
-        let _ = self.flush(true);
+        // When reaching this point the queue should have been flushed already, but do it here once
+        // again just to be sure.
+        let _ = self.flush(false);
     }
 }