diff --git a/rocclr/runtime/device/devprogram.cpp b/rocclr/runtime/device/devprogram.cpp
index fc5b278487..532b7c2886 100644
--- a/rocclr/runtime/device/devprogram.cpp
+++ b/rocclr/runtime/device/devprogram.cpp
@@ -1857,6 +1857,10 @@ bool Program::linkImplHSAIL(amd::option::Options* options) {
     fin_options.append(" -force-wave-size-32");
   }
 
+  if (device().settings().enableWgpMode_) {
+    fin_options.append(" -force-wgp-mode");
+  }
+
   if (device().settings().hsailExplicitXnack_) {
     fin_options.append(" -xnack");
   }
diff --git a/rocclr/runtime/device/pal/palsettings.cpp b/rocclr/runtime/device/pal/palsettings.cpp
index 4fba0649b5..1e9d19220d 100644
--- a/rocclr/runtime/device/pal/palsettings.cpp
+++ b/rocclr/runtime/device/pal/palsettings.cpp
@@ -193,16 +193,16 @@ bool Settings::create(const Pal::DeviceProperties& palProp,
       gfx10Plus_ = true;
       hsailExplicitXnack_ = static_cast<uint>(palProp.gpuMemoryProperties.flags.pageMigrationEnabled
         || palProp.gpuMemoryProperties.flags.iommuv2Support);
-      enableWgpMode_ = GPU_ENABLE_WGP_MODE || !useLightning_;
+      enableWgpMode_ = GPU_ENABLE_WGP_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;
       }
+      if (!flagIsDefault(GPU_ENABLE_WAVE32_MODE)) {
+        enableWave32Mode_ = GPU_ENABLE_WAVE32_MODE;
+      }
       lcWavefrontSize64_ = !enableWave32Mode_;
       // Fall through to AI (gfx9) ...
     case Pal::AsicRevision::Vega20: