diff --git a/rocclr/runtime/platform/commandqueue.cpp b/rocclr/runtime/platform/commandqueue.cpp
index 2990271e18..95ed258551 100644
--- a/rocclr/runtime/platform/commandqueue.cpp
+++ b/rocclr/runtime/platform/commandqueue.cpp
@@ -184,6 +184,10 @@ void HostQueue::setLastQueuedCommand(Command* lastCommand) {
 Command* HostQueue::getLastQueuedCommand(bool retain) {
   // Get last submitted command
   ScopedLock sl(queueLock_);
+  if (lastEnqueueCommand_ == nullptr) {
+    return nullptr;
+  }
+
   if (retain) {
     lastEnqueueCommand_->retain();
   }