diff --git a/rocclr/runtime/platform/command.cpp b/rocclr/runtime/platform/command.cpp
index 6611d7abdc..9780b1d37a 100644
--- a/rocclr/runtime/platform/command.cpp
+++ b/rocclr/runtime/platform/command.cpp
@@ -207,7 +207,7 @@ Command::Command(HostQueue& queue, cl_command_type type,
       commandWaitBits_(commandWaitBits) {
   // Retain the commands from the event wait list.
   std::for_each(eventWaitList.begin(), eventWaitList.end(), std::mem_fun(&Command::retain));
-  activity_.Initialize(type, queue.vdev()->index(), queue.device().index());
+  if (type != 0) activity_.Initialize(type, queue.vdev()->index(), queue.device().index());
 }
 
 void Command::releaseResources() {