diff --git a/src/hip_memory.cpp b/src/hip_memory.cpp
index 2deedbc635..c249c08d63 100644
--- a/src/hip_memory.cpp
+++ b/src/hip_memory.cpp
@@ -1989,7 +1989,8 @@ hipError_t hipFree(void* ptr) {
 #endif
         am_status_t status = hc::am_memtracker_getinfo(&amPointerInfo, ptr);
         if (status == AM_SUCCESS) {
-            if (amPointerInfo._hostPointer == NULL) {
+            /*if (amPointerInfo._hostPointer == NULL) */ //TODO Fix this when there is proper Managed memeory support
+            {
                 if (HIP_SYNC_FREE) {
                     // Synchronize all devices, all streams
                     // to ensure all work has finished on all devices.