diff --git a/projects/clr/hipamd/src/hip_graph.cpp b/projects/clr/hipamd/src/hip_graph.cpp
index 34df77cd7d..c0995f9415 100644
--- a/projects/clr/hipamd/src/hip_graph.cpp
+++ b/projects/clr/hipamd/src/hip_graph.cpp
@@ -1456,6 +1456,9 @@ hipError_t hipStreamGetCaptureInfo_common(hipStream_t stream,
   if (pCaptureStatus == nullptr || !hip::isValid(stream)) {
     return hipErrorInvalidValue;
   }
+  if (hip::Stream::StreamCaptureBlocking() == true && stream == nullptr) {
+    return hipErrorStreamCaptureImplicit;
+  }
   if (stream == nullptr) {
     return hipErrorUnknown;
   }
@@ -1488,6 +1491,9 @@ hipError_t hipStreamGetCaptureInfo_v2_common(hipStream_t stream,
   if (captureStatus_out == nullptr) {
     return hipErrorInvalidValue;
   }
+  if (hip::Stream::StreamCaptureBlocking() == true && stream == nullptr) {
+    return hipErrorStreamCaptureImplicit;
+  }
   if (stream == nullptr) {
     return hipErrorUnknown;
   }