diff --git a/projects/clr/hipamd/rocclr/hip_stream.cpp b/projects/clr/hipamd/rocclr/hip_stream.cpp
index 7f74136080..109e8c8b7d 100755
--- a/projects/clr/hipamd/rocclr/hip_stream.cpp
+++ b/projects/clr/hipamd/rocclr/hip_stream.cpp
@@ -168,6 +168,10 @@ void iHipWaitActiveStreams(amd::HostQueue* blocking_queue, bool wait_null_stream
             command->release();
           }
         }
+        // Nullstream, hence there is nothing else to wait
+        if (wait_null_stream) {
+          break;
+        }
       }
     }
   }