diff --git a/rocclr/runtime/device/pal/palwavelimiter.cpp b/rocclr/runtime/device/pal/palwavelimiter.cpp
index 8df84fb202..f94cf06b41 100644
--- a/rocclr/runtime/device/pal/palwavelimiter.cpp
+++ b/rocclr/runtime/device/pal/palwavelimiter.cpp
@@ -45,9 +45,11 @@ uint WaveLimiter::getWavesPerSH() {
   // Generate different wave counts in the adaptation mode
   if ((state_ == ADAPT) && (sampleCount_ < AdaptCount)) {
     if (numContinuousSamples_ == 0) {
-        waves_ = (++waves_) % (MaxWave + 1);
+        ++waves_;
+        waves_ %= MaxWave + 1;
     }
-    numContinuousSamples_ = (++numContinuousSamples_) % MaxContinuousSamples;
+    ++numContinuousSamples_;
+    numContinuousSamples_ %= MaxContinuousSamples;
     ++sampleCount_;
   }
   else {