diff --git a/projects/clr/rocclr/runtime/device/gpu/gpuwavelimiter.cpp b/projects/clr/rocclr/runtime/device/gpu/gpuwavelimiter.cpp
index 47353e9e42..88d0de3362 100644
--- a/projects/clr/rocclr/runtime/device/gpu/gpuwavelimiter.cpp
+++ b/projects/clr/rocclr/runtime/device/gpu/gpuwavelimiter.cpp
@@ -47,6 +47,12 @@ WaveLimiter::WaveLimiter(Kernel *owner) :
     setIfNotDefault(SIMDPerSH_, GPU_WAVE_LIMIT_CU_PER_SH,
             attrib.numberOfCUsperShaderArray * hwInfo->simdPerCU_);
 
+    MaxWave = GPU_WAVE_LIMIT_MAX_WAVE;
+    WarmUpCount = GPU_WAVE_LIMIT_WARMUP;
+    AdaptCount = GPU_WAVE_LIMIT_ADAPT * MaxWave;
+    RunCount = GPU_WAVE_LIMIT_RUN * MaxWave;
+    AbandonThresh = GPU_WAVE_LIMIT_ABANDON;
+
     state_ = WARMUP;
     dynRunCount_ = RunCount;
     auto size = MaxWave + 1;
@@ -60,12 +66,6 @@ WaveLimiter::WaveLimiter(Kernel *owner) :
             ".txt");
     }
 
-    MaxWave = GPU_WAVE_LIMIT_MAX_WAVE;
-    WarmUpCount = GPU_WAVE_LIMIT_WARMUP;
-    AdaptCount = GPU_WAVE_LIMIT_ADAPT * MaxWave;
-    RunCount = GPU_WAVE_LIMIT_RUN * MaxWave;
-    AbandonThresh = GPU_WAVE_LIMIT_ABANDON;
-
     waves_ = GPU_WAVES_PER_SIMD;
     bestWave_ = MaxWave;
     enable_ = false;