diff --git a/rocclr/platform/command.cpp b/rocclr/platform/command.cpp
index 9829290b02..2c98c4563d 100644
--- a/rocclr/platform/command.cpp
+++ b/rocclr/platform/command.cpp
@@ -388,7 +388,7 @@ void Command::enqueue() {
 
   if ((queue_->device().settings().waitCommand_ && (type_ != 0)) ||
       ((commandWaitBits_ & 0x2) != 0)) {
-    awaitCompletion();
+    queue_->finish();
   }
 
   // set this queue status is active