diff --git a/projects/clr/rocclr/runtime/device/pal/palsettings.cpp b/projects/clr/rocclr/runtime/device/pal/palsettings.cpp
index b96eb2d980..89dffbcfa8 100644
--- a/projects/clr/rocclr/runtime/device/pal/palsettings.cpp
+++ b/projects/clr/rocclr/runtime/device/pal/palsettings.cpp
@@ -192,7 +192,12 @@ bool Settings::create(const Pal::DeviceProperties& palProp,
       hsailExplicitXnack_ = static_cast<uint>(palProp.gpuMemoryProperties.flags.pageMigrationEnabled
         || palProp.gpuMemoryProperties.flags.iommuv2Support);
       enableWgpMode_ = GPU_ENABLE_WGP_MODE || !useLightning_;
-      enableWave32Mode_ = GPU_ENABLE_WAVE32_MODE;
+      if (useLightning_) {
+        enableWave32Mode_ = true;
+      }
+      if (!flagIsDefault(GPU_ENABLE_WAVE32_MODE)) {
+        enableWave32Mode_ = GPU_ENABLE_WAVE32_MODE;
+      }
       if (palProp.revision == Pal::AsicRevision::Navi10Lite && useLightning_) {
         enableWave32Mode_ = false;
       }