diff --git a/api/hip/hip_event.cpp b/api/hip/hip_event.cpp
index 8262a770d0..143d2eded9 100644
--- a/api/hip/hip_event.cpp
+++ b/api/hip/hip_event.cpp
@@ -115,7 +115,7 @@ hipError_t Event::streamWait(amd::HostQueue* hostQueue, uint flags) {
   amd::Command::EventWaitList eventWaitList;
   eventWaitList.push_back(event_);
 
-  amd::Command* command = new amd::Marker(*hostQueue, true, eventWaitList);
+  amd::Command* command = new amd::Marker(*hostQueue, false, eventWaitList);
   if (command == NULL) {
     return hipErrorOutOfMemory;
   }
@@ -241,7 +241,7 @@ hipError_t hipEventRecord(hipEvent_t event, hipStream_t stream) {
   amd::Command* command = queue->getLastQueuedCommand(true);
 
   if (command == nullptr) {
-    command = new amd::Marker(*queue, true);
+    command = new amd::Marker(*queue, false);
     command->enqueue();
   }
 
diff --git a/api/hip/hip_event.hpp b/api/hip/hip_event.hpp
index 410c19c7b4..ddf7a9c06b 100644
--- a/api/hip/hip_event.hpp
+++ b/api/hip/hip_event.hpp
@@ -30,7 +30,7 @@ namespace hip {
 
 class TimerMarker: public amd::Marker {
 public:
-  TimerMarker(amd::HostQueue& queue) : amd::Marker(queue, true) {
+  TimerMarker(amd::HostQueue& queue) : amd::Marker(queue, false) {
     profilingInfo_.enabled_ = true;
     profilingInfo_.callback_ = nullptr;
     profilingInfo_.start_ = profilingInfo_.end_ = 0;
diff --git a/api/hip/hip_stream.cpp b/api/hip/hip_stream.cpp
index a87e0e0d79..5dfe6f2db0 100644
--- a/api/hip/hip_stream.cpp
+++ b/api/hip/hip_stream.cpp
@@ -244,8 +244,7 @@ hipError_t hipStreamQuery(hipStream_t stream) {
   }
 
   amd::Event& event = command->event();
-
-  if (command->type() != CL_COMMAND_MARKER) {
+  if (command->type() != 0) {
     event.notifyCmdQueue();
   }
   HIP_RETURN((command->status() == CL_COMPLETE) ? hipSuccess : hipErrorNotReady);