diff --git a/projects/clr/hipamd/include/nvcc_detail/hip_runtime_api.h b/projects/clr/hipamd/include/nvcc_detail/hip_runtime_api.h
index a8408211b2..1413d735f6 100644
--- a/projects/clr/hipamd/include/nvcc_detail/hip_runtime_api.h
+++ b/projects/clr/hipamd/include/nvcc_detail/hip_runtime_api.h
@@ -177,6 +177,7 @@ inline static hipError_t hipDeviceGetProperties(hipDeviceProp_t *p_prop, int dev
 	p_prop->l2CacheSize = cdprop.l2CacheSize ;
 	p_prop->maxThreadsPerMultiProcessor = cdprop.maxThreadsPerMultiProcessor ;
 	p_prop->computeMode = cdprop.computeMode ;
+	p_prop->canMapHostMemory = cdprop.canMapHostMemory;
 
 	// Same as clock-rate:
 	p_prop->clockInstructionRate = cdprop.clockRate; 
diff --git a/projects/clr/hipamd/tests/src/hipHostAlloc.cpp b/projects/clr/hipamd/tests/src/hipHostAlloc.cpp
new file mode 100644
index 0000000000..b8acdeb0b3
--- /dev/null
+++ b/projects/clr/hipamd/tests/src/hipHostAlloc.cpp
@@ -0,0 +1,20 @@
+#include<iostream>
+#include"test_common.h"
+
+__global__ void Add(hipLaunchParm lp, float *Ad, float *Bd, float *Cd){
+int tx = hipThreadIdx_x + hipBlockIdx_x * hipBlockDim_x;
+Cd[tx] = Ad[tx] + Bd[tx];
+}
+
+int main(){
+float *A, *B, *C;
+float *Ad, *Bd, *Cd;
+
+hipDeviceProp_t prop;
+int device;
+hipGetDevice(&device);
+hipDeviceGetProperties(&prop, device);
+if(prop.canMapHostMemory != 1){
+std::cout<<"Exiting.."<<std::endl;
+}
+}