diff --git a/hipamd/src/hip_module.cpp b/hipamd/src/hip_module.cpp
index 5300db97ea..4dcebaee93 100644
--- a/hipamd/src/hip_module.cpp
+++ b/hipamd/src/hip_module.cpp
@@ -440,8 +440,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<uint16_t>::max()+1 ||
-      gridDimZ > std::numeric_limits<uint16_t>::max()+1) {
+      gridDimY > std::numeric_limits<int32_t>::max() ||
+      gridDimZ > std::numeric_limits<int32_t>::max()) {
     HIP_RETURN(hipErrorInvalidValue);
   }
   size_t globalWorkSizeX = static_cast<size_t>(gridDimX) * blockDimX;