diff --git a/hipamd/api/hip/hip_device.cpp b/hipamd/api/hip/hip_device.cpp
index 5c8de8c03a..5c03f13cc5 100644
--- a/hipamd/api/hip/hip_device.cpp
+++ b/hipamd/api/hip/hip_device.cpp
@@ -147,9 +147,9 @@ hipError_t hipGetDeviceProperties ( hipDeviceProp_t* props, hipDevice_t device )
   deviceProps.maxThreadsDim[0] = info.maxWorkItemSizes_[0];
   deviceProps.maxThreadsDim[1] = info.maxWorkItemSizes_[1];
   deviceProps.maxThreadsDim[2] = info.maxWorkItemSizes_[2];
-  deviceProps.maxGridSize[0] = UINT32_MAX;
-  deviceProps.maxGridSize[1] = UINT32_MAX;
-  deviceProps.maxGridSize[2] = UINT32_MAX;
+  deviceProps.maxGridSize[0] = INT32_MAX;
+  deviceProps.maxGridSize[1] = INT32_MAX;
+  deviceProps.maxGridSize[2] = INT32_MAX;
   deviceProps.clockRate = info.maxEngineClockFrequency_ * 1000;
   deviceProps.memoryClockRate = info.maxMemoryClockFrequency_ * 1000;
   deviceProps.memoryBusWidth = info.globalMemChannels_ * 32;