diff --git a/projects/clr/rocclr/runtime/device/pal/paldevice.cpp b/projects/clr/rocclr/runtime/device/pal/paldevice.cpp
index cd246ae6c2..82e292cc5b 100644
--- a/projects/clr/rocclr/runtime/device/pal/paldevice.cpp
+++ b/projects/clr/rocclr/runtime/device/pal/paldevice.cpp
@@ -469,7 +469,7 @@ void NullDevice::fillDeviceInfo(const Pal::DeviceProperties& palProp,
   if (settings().use64BitPtr_) {
     info_.addressBits_ = 64;
   } else {
-    info_.addressBits_ = 32;
+    info_.addressBits_ = (settings().useLightning_) ? 64 : 32;
     // Limit total size with 3GB for 32 bit
     info_.globalMemSize_ = std::min(info_.globalMemSize_, cl_ulong(3 * Gi));
   }