diff --git a/projects/clr/rocclr/runtime/device/rocm/rocsettings.cpp b/projects/clr/rocclr/runtime/device/rocm/rocsettings.cpp
index e2d7a8c529..1b150c4997 100644
--- a/projects/clr/rocclr/runtime/device/rocm/rocsettings.cpp
+++ b/projects/clr/rocclr/runtime/device/rocm/rocsettings.cpp
@@ -68,6 +68,8 @@ Settings::Settings() {
   numWaitEvents_ = 8;
 
   useLightning_ = GPU_ENABLE_LC;
+
+  lcWavefrontSize64_ = true;
 }
 
 bool Settings::create(bool fullProfile, int gfxipVersion) {
@@ -121,6 +123,10 @@ bool Settings::create(bool fullProfile, int gfxipVersion) {
     enableExtension(ClAmdFp64);
   }
 
+  if (gfxipVersion >= 1000) {
+    lcWavefrontSize64_ = false;
+  }
+
   // Override current device settings
   override();