diff --git a/hipamd/vdi/hip_event.cpp b/hipamd/vdi/hip_event.cpp
index 677becd67e..6219f0c948 100644
--- a/hipamd/vdi/hip_event.cpp
+++ b/hipamd/vdi/hip_event.cpp
@@ -95,12 +95,20 @@ hipError_t Event::elapsedTime(Event& eStop, float& ms) {
 }
 
 hipError_t Event::streamWait(amd::HostQueue* hostQueue, uint flags) {
-  if ((event_ == nullptr) || (event_->command().queue() == hostQueue)) {
+  // Effective no-op if event is NULL
+  if (event_ == nullptr) {
     return hipSuccess;
   }
 
   amd::ScopedLock lock(lock_);
-  bool retain = false;
+
+  if (event_->command().queue() == hostQueue) {
+    // Wake up commandQueue thread
+    if (!event_->notifyCmdQueue()) {
+      return hipErrorLaunchOutOfResources;
+    }
+    return hipSuccess;
+  }
 
   if (!event_->notifyCmdQueue()) {
     return hipErrorLaunchOutOfResources;