diff --git a/projects/clr/hipamd/src/hip_vm.cpp b/projects/clr/hipamd/src/hip_vm.cpp
index 5df9c41902..73ba16776b 100644
--- a/projects/clr/hipamd/src/hip_vm.cpp
+++ b/projects/clr/hipamd/src/hip_vm.cpp
@@ -168,7 +168,9 @@ hipError_t hipMemGetAllocationGranularity(size_t* granularity, const hipMemAlloc
   HIP_INIT_API(hipMemGetAllocationGranularity, granularity, prop, option);
 
   if (granularity == nullptr || prop == nullptr || prop->type != hipMemAllocationTypePinned ||
-      prop->location.type != hipMemLocationTypeDevice || prop->location.id >= g_devices.size()) {
+      prop->location.type != hipMemLocationTypeDevice || prop->location.id >= g_devices.size() ||
+      (option != hipMemAllocationGranularityMinimum &&
+       option != hipMemAllocationGranularityRecommended)) {
     HIP_RETURN(hipErrorInvalidValue);
   }