diff --git a/src/hip_hcc.cpp b/src/hip_hcc.cpp
index 377ce0aad4..cc83ca0657 100644
--- a/src/hip_hcc.cpp
+++ b/src/hip_hcc.cpp
@@ -310,6 +310,8 @@ void ihipStream_t::locked_wait() {
     hc::completion_future marker;
     {
         LockedAccessor_StreamCrit_t crit(_criticalData);
+        // skipping marker since stream is empty
+        if (crit->_av.get_is_empty()) return;
         marker = crit->_av.create_marker(hc::no_scope);
     }