diff --git a/rocclr/runtime/platform/commandqueue.cpp b/rocclr/runtime/platform/commandqueue.cpp
index b725c3b27b..bf27b38d6b 100644
--- a/rocclr/runtime/platform/commandqueue.cpp
+++ b/rocclr/runtime/platform/commandqueue.cpp
@@ -135,11 +135,11 @@ void HostQueue::loop(device::VirtualDevice* virtualDevice) {
 
     ClPrint(LOG_DEBUG, LOG_CMD, "command is submitted: %p", command);
 
+    command->setStatus(CL_SUBMITTED);
+
     // Submit to the device queue.
     command->submit(*virtualDevice);
 
-    command->setStatus(CL_SUBMITTED);
-
     // if this is a user invisible marker command, then flush
     if (0 == command->type()) {
       virtualDevice->flush(head);