diff --git a/rocclr/runtime/device/gpu/gpudevice.cpp b/rocclr/runtime/device/gpu/gpudevice.cpp
index 0427e69775..0e76778d7b 100644
--- a/rocclr/runtime/device/gpu/gpudevice.cpp
+++ b/rocclr/runtime/device/gpu/gpudevice.cpp
@@ -566,9 +566,7 @@ Device::Heap::create(Device& device)
         return false;
     }
 
-    if (!device.settings().hsail_) {
-        baseAddress_ = resource_->gslResource()->getSurfaceAddress();
-    }
+    baseAddress_ = resource_->gslResource()->getSurfaceAddress();
     return true;
 }