diff --git a/projects/hip/api/hip/hip_memory.cpp b/projects/hip/api/hip/hip_memory.cpp
index 05fcfbe21a..ebe630924b 100644
--- a/projects/hip/api/hip/hip_memory.cpp
+++ b/projects/hip/api/hip/hip_memory.cpp
@@ -186,6 +186,8 @@ hipError_t hipHostMalloc(void** ptr, size_t sizeBytes, unsigned int flags) {
 
 hipError_t hipFree(void* ptr) {
   if (amd::SvmBuffer::malloced(ptr)) {
+    hip::syncStreams();
+    hip::getNullStream()->finish();
     amd::SvmBuffer::free(*hip::getCurrentContext(), ptr);
     return hipSuccess;
   }