diff --git a/hipamd/src/hip_memory.cpp b/hipamd/src/hip_memory.cpp
index a824e65914..50c44c5ce8 100644
--- a/hipamd/src/hip_memory.cpp
+++ b/hipamd/src/hip_memory.cpp
@@ -600,6 +600,13 @@ hipError_t hipMemPtrGetInfo(void *ptr, size_t *size) {
 hipError_t hipHostFree(void* ptr) {
   HIP_INIT_API(hipHostFree, ptr);
   CHECK_STREAM_CAPTURE_SUPPORTED();
+  size_t offset = 0;
+  amd::Memory* memory_object = getMemoryObject(ptr, offset);
+  if (memory_object != nullptr) {
+    if (memory_object->getSvmPtr() == nullptr) {
+      return hipErrorInvalidValue;
+    }
+  }
   HIP_RETURN(ihipFree(ptr));
 }