diff --git a/projects/clr/hipamd/include/hip/nvcc_detail/hip_runtime_api.h b/projects/clr/hipamd/include/hip/nvcc_detail/hip_runtime_api.h
index b788aa5cdc..97551d15d4 100644
--- a/projects/clr/hipamd/include/hip/nvcc_detail/hip_runtime_api.h
+++ b/projects/clr/hipamd/include/hip/nvcc_detail/hip_runtime_api.h
@@ -992,8 +992,7 @@ inline static hipError_t hipDeviceGetAttribute(int* pi, hipDeviceAttribute_t att
             cdattr = cudaDevAttrEccEnabled;
             break;
         default:
-            cerror = cudaErrorInvalidValue;
-            break;
+            return hipCUDAErrorTohipError(cudaErrorInvalidValue);
     }
 
     cerror = cudaDeviceGetAttribute(pi, cdattr, device);