diff --git a/hipamd/src/hip_module.cpp b/hipamd/src/hip_module.cpp
index 8743beb2a8..eea5efd41b 100644
--- a/hipamd/src/hip_module.cpp
+++ b/hipamd/src/hip_module.cpp
@@ -444,8 +444,8 @@ hipError_t hipModuleLaunchKernel(hipFunction_t f, uint32_t gridDimX, uint32_t gr
   STREAM_CAPTURE(hipModuleLaunchKernel, hStream, f, gridDimX, gridDimY, gridDimZ, blockDimX,
                  blockDimY, blockDimZ, sharedMemBytes, kernelParams, extra);
   if (gridDimX > std::numeric_limits<int32_t>::max() ||
-      gridDimY > std::numeric_limits<int32_t>::max() ||
-      gridDimZ > std::numeric_limits<int32_t>::max()) {
+      gridDimY > std::numeric_limits<int32_t>::max()/1024 ||
+      gridDimZ > std::numeric_limits<int32_t>::max()/1024) {
     HIP_RETURN(hipErrorInvalidValue);
   }
   size_t globalWorkSizeX = static_cast<size_t>(gridDimX) * blockDimX;