diff --git a/projects/clr/hipamd/api/hip/hip_device_runtime.cpp b/projects/clr/hipamd/api/hip/hip_device_runtime.cpp
index 77d90d2cb0..c7a4d4913d 100644
--- a/projects/clr/hipamd/api/hip/hip_device_runtime.cpp
+++ b/projects/clr/hipamd/api/hip/hip_device_runtime.cpp
@@ -375,6 +375,13 @@ hipError_t hipDeviceSetSharedMemConfig ( hipSharedMemConfig config ) {
 }
 
 hipError_t hipDeviceSynchronize ( void ) {
+  amd::HostQueue* queue = hip::getNullStream();
+
+  if (!queue) {
+    return hipErrorOutOfMemory;
+  }
+
+  queue->finish();
   return hipSuccess;
 }