diff --git a/projects/hip/rocclr/hip_context.cpp b/projects/hip/rocclr/hip_context.cpp
index 2f75d07b8a..2d0abc6add 100755
--- a/projects/hip/rocclr/hip_context.cpp
+++ b/projects/hip/rocclr/hip_context.cpp
@@ -84,7 +84,9 @@ amd::HostQueue* getQueue(hipStream_t stream) {
   } else {
     constexpr bool WaitNullStreamOnly = true;
     amd::HostQueue* queue = reinterpret_cast<hip::Stream*>(stream)->asHostQueue();
-    iHipWaitActiveStreams(queue, WaitNullStreamOnly);
+    if (!(reinterpret_cast<hip::Stream*>(stream)->Flags() & hipStreamNonBlocking)) {
+      iHipWaitActiveStreams(queue, WaitNullStreamOnly);
+    }
     return queue;
   }
 }