diff --git a/hipamd/src/hip_device.cpp b/hipamd/src/hip_device.cpp
index 2908dd3610..268e2ca815 100644
--- a/hipamd/src/hip_device.cpp
+++ b/hipamd/src/hip_device.cpp
@@ -286,7 +286,7 @@ hipError_t ihipGetDeviceProperties(hipDeviceProp_t* props, hipDevice_t device) {
   auto* deviceHandle = g_devices[device]->devices()[0];
 
   constexpr auto int32_max = static_cast<uint64_t>(std::numeric_limits<int32_t>::max());
-  constexpr auto uint16_max = static_cast<uint64_t>(std::numeric_limits<uint16_t>::max());
+  constexpr auto uint16_max = static_cast<uint64_t>(std::numeric_limits<uint16_t>::max())+1;
   hipDeviceProp_t deviceProps = {0};
 
   const auto& info = deviceHandle->info();
diff --git a/hipamd/src/hip_module.cpp b/hipamd/src/hip_module.cpp
index b2630af42b..5300db97ea 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() ||
-      gridDimZ > std::numeric_limits<uint16_t>::max()) {
+      gridDimY > std::numeric_limits<uint16_t>::max()+1 ||
+      gridDimZ > std::numeric_limits<uint16_t>::max()+1) {
     HIP_RETURN(hipErrorInvalidValue);
   }
   size_t globalWorkSizeX = static_cast<size_t>(gridDimX) * blockDimX;