diff --git a/hipamd/src/hip_surface.cpp b/hipamd/src/hip_surface.cpp
index cd40e254ef..6b62e025c7 100644
--- a/hipamd/src/hip_surface.cpp
+++ b/hipamd/src/hip_surface.cpp
@@ -66,6 +66,12 @@ hipError_t ihipCreateSurfaceObject(hipSurfaceObject_t* pSurfObject,
     return hipErrorInvalidValue;
   }
 
+  if (DEBUG_HIP_7_PREVIEW & amd::CHANGE_HIP_STREAM_CAPTURE_API) {
+    if (!hip::tls.capture_streams_.empty() || !g_captureStreams.empty()) {
+      HIP_RETURN(hipErrorStreamCaptureUnsupported);
+    }
+  }
+
   amd::Image* image = nullptr;
   cl_mem memObj = reinterpret_cast<cl_mem>(pResDesc->res.array.array->data);
   if (!is_valid(memObj)) {
@@ -96,6 +102,12 @@ hipError_t ihipDestroySurfaceObject(hipSurfaceObject_t surfaceObject) {
     return hipSuccess;
   }
 
+  if (DEBUG_HIP_7_PREVIEW & amd::CHANGE_HIP_STREAM_CAPTURE_API) {
+    if (!hip::tls.capture_streams_.empty() || !g_captureStreams.empty()) {
+      HIP_RETURN(hipErrorStreamCaptureUnsupported);
+    }
+  }
+
   return ihipFree(surfaceObject);
 }