diff --git a/projects/clr/hipamd/src/hip_stream.cpp b/projects/clr/hipamd/src/hip_stream.cpp
index a396e81249..c41896714a 100644
--- a/projects/clr/hipamd/src/hip_stream.cpp
+++ b/projects/clr/hipamd/src/hip_stream.cpp
@@ -506,14 +506,10 @@ hipError_t hipStreamWaitEvent_common(hipStream_t stream, hipEvent_t event, unsig
     return hipErrorInvalidHandle;
   }
 
-  if (flags != 0) {
+  if (flags != 0 || !hip::isValid(stream)) {
     return hipErrorInvalidValue;
   }
 
-  if (!hip::isValid(stream)) {
-    return hipErrorContextIsDestroyed;
-  }
-
   hip::Event* e = reinterpret_cast<hip::Event*>(event);
   return e->streamWait(stream, flags);
 }