diff --git a/rocclr/runtime/device/devkernel.cpp b/rocclr/runtime/device/devkernel.cpp
index 12ec537d31..fb08b4ba8d 100644
--- a/rocclr/runtime/device/devkernel.cpp
+++ b/rocclr/runtime/device/devkernel.cpp
@@ -28,7 +28,7 @@ Kernel::Kernel(const amd::Device& dev, const std::string& name)
   : dev_(dev)
   , name_(name)
   , signature_(nullptr)
-  , waveLimiter_(this, dev.info().cuPerShaderArray_ * dev.info().cuPerShaderArray_) {
+  , waveLimiter_(this, dev.info().cuPerShaderArray_ * dev.info().simdPerCU_) {
   // Instead of memset(&workGroupInfo_, '\0', sizeof(workGroupInfo_));
   // Due to std::string not being able to be memset to 0
   workGroupInfo_.size_ = 0;