diff --git a/rocclr/runtime/device/devprogram.cpp b/rocclr/runtime/device/devprogram.cpp
index 532b7c2886..51511f65c7 100644
--- a/rocclr/runtime/device/devprogram.cpp
+++ b/rocclr/runtime/device/devprogram.cpp
@@ -1449,6 +1449,9 @@ bool Program::linkImplLC(amd::option::Options* options) {
     if (options->oVariables->UnsafeMathOpt || options->oVariables->FastRelaxedMath) {
         linkOptions += "unsafe_math,";
     }
+    if (device().settings().lcWavefrontSize64_) {
+        linkOptions += "wavefrontsize64,";
+    }
     if (!linkOptions.empty()) {
         linkOptions.pop_back();     // remove the last comma
     }
diff --git a/rocclr/runtime/device/pal/palsettings.cpp b/rocclr/runtime/device/pal/palsettings.cpp
index 1e9d19220d..54887d0253 100644
--- a/rocclr/runtime/device/pal/palsettings.cpp
+++ b/rocclr/runtime/device/pal/palsettings.cpp
@@ -143,7 +143,7 @@ Settings::Settings() {
   enableWgpMode_ = false;
   enableWave32Mode_ = false;
   hsailExplicitXnack_ = false;
-  lcWavefrontSize64_ = false;
+  lcWavefrontSize64_ = true;
 }
 
 bool Settings::create(const Pal::DeviceProperties& palProp,