diff --git a/rocclr/platform/commandqueue.cpp b/rocclr/platform/commandqueue.cpp
index ea80a82dea..4f552e4ab0 100644
--- a/rocclr/platform/commandqueue.cpp
+++ b/rocclr/platform/commandqueue.cpp
@@ -107,6 +107,10 @@ void HostQueue::finish() {
   Command* command = nullptr;
   if (IS_HIP) {
     command = getLastQueuedCommand(true);
+    // Check if the queue has nothing to process and return
+    if (command == nullptr) {
+      return;
+    }
   }
   if (nullptr == command) {
     // Send a finish to make sure we finished all commands