diff --git a/rocclr/platform/commandqueue.cpp b/rocclr/platform/commandqueue.cpp
index 2cc44abb3c..0e904aab89 100644
--- a/rocclr/platform/commandqueue.cpp
+++ b/rocclr/platform/commandqueue.cpp
@@ -108,7 +108,7 @@ void HostQueue::finish() {
   if (IS_HIP) {
     command = getLastQueuedCommand(true);
     // Check if the queue has nothing to process and return
-    if (command == nullptr) {
+    if (AMD_DIRECT_DISPATCH &&  command == nullptr) {
       return;
     }
   }