diff --git a/rocclr/platform/commandqueue.cpp b/rocclr/platform/commandqueue.cpp
index 8ff9a67414..4af38dd53b 100644
--- a/rocclr/platform/commandqueue.cpp
+++ b/rocclr/platform/commandqueue.cpp
@@ -234,6 +234,7 @@ Command* HostQueue::getLastQueuedCommand(bool retain) {
     if (retain && lastEnqueueCommand_ != nullptr) {
       lastEnqueueCommand_->retain();
     }
+    return lastEnqueueCommand_;
   } else {
     // Get last submitted command
     ScopedLock l(lastCmdLock_);
@@ -243,9 +244,8 @@ Command* HostQueue::getLastQueuedCommand(bool retain) {
     if (retain && lastEnqueueCommand_ != nullptr) {
       lastEnqueueCommand_->retain();
     }
+    return lastEnqueueCommand_;
   }
-
-  return lastEnqueueCommand_;
 }
 
 DeviceQueue::~DeviceQueue() {