diff --git a/projects/clr/hipamd/src/hip_module.cpp b/projects/clr/hipamd/src/hip_module.cpp
index a381311b60..e1c801b81f 100644
--- a/projects/clr/hipamd/src/hip_module.cpp
+++ b/projects/clr/hipamd/src/hip_module.cpp
@@ -114,7 +114,7 @@ hipError_t hipModuleGetGlobal(hipDeviceptr_t* dptr, size_t* bytes, hipModule_t h
 hipError_t hipFuncGetAttribute(int* value, hipFunction_attribute attrib, hipFunction_t hfunc) {
   HIP_INIT_API(hipFuncGetAttribute, value, attrib, hfunc);
 
-  if ((value == nullptr) || (hfunc == nullptr)) {
+  if ((value == nullptr)) {
     HIP_RETURN(hipErrorInvalidValue);
   }
 
diff --git a/projects/clr/hipamd/src/hip_platform.cpp b/projects/clr/hipamd/src/hip_platform.cpp
index 8f532361bc..afcbaab007 100644
--- a/projects/clr/hipamd/src/hip_platform.cpp
+++ b/projects/clr/hipamd/src/hip_platform.cpp
@@ -860,9 +860,12 @@ hipError_t PlatformState::getStatFunc(hipFunction_t* hfunc, const void* hostFunc
 
 hipError_t PlatformState::getStatFuncAttr(hipFuncAttributes* func_attr, const void* hostFunction,
                                           int deviceId) {
-  if (func_attr == nullptr || hostFunction == nullptr) {
+  if (func_attr == nullptr) {
     return hipErrorInvalidValue;
   }
+  if (hostFunction == nullptr) {
+    return hipErrorInvalidDeviceFunction;
+  }
   return statCO_.getStatFuncAttr(func_attr, hostFunction, deviceId);
 }