diff --git a/projects/clr/rocclr/runtime/device/hsa/hsadevice.cpp b/projects/clr/rocclr/runtime/device/hsa/hsadevice.cpp
index 90c7326281..9f30a41ad1 100644
--- a/projects/clr/rocclr/runtime/device/hsa/hsadevice.cpp
+++ b/projects/clr/rocclr/runtime/device/hsa/hsadevice.cpp
@@ -490,7 +490,8 @@ Device::mapHSADeviceToOpenCLDevice(const HsaDevice *dev)
 
     info_.maxWorkGroupSize_ = dev->wave_front_size * dev->max_waves_per_simd;
     info_.maxClockFrequency_ = dev->max_clock_rate_of_f_compute;
-    info_.imageSupport_ = dev->is_image_support;
+    //info_.imageSupport_ = dev->is_image_support;
+    info_.imageSupport_ = false;
 
     info_.localMemSizePerCU_ = dev->group_memory_size;
 
diff --git a/projects/clr/rocclr/runtime/device/hsa/hsasettings.cpp b/projects/clr/rocclr/runtime/device/hsa/hsasettings.cpp
index 9c0ef8d9a4..fc4db222a7 100644
--- a/projects/clr/rocclr/runtime/device/hsa/hsasettings.cpp
+++ b/projects/clr/rocclr/runtime/device/hsa/hsasettings.cpp
@@ -45,7 +45,7 @@ Settings::create(bool doublePrecision)
     enableExtension(ClKhrLocalInt32BaseAtomics);
     enableExtension(ClKhrLocalInt32ExtendedAtomics);
     enableExtension(ClExtAtomicCounters32);
-    enableExtension(ClKhr3DImageWrites);
+    //enableExtension(ClKhr3DImageWrites);
     enableExtension(ClKhrGlSharing);
     enableExtension(ClAmdMediaOps);
     enableExtension(ClAmdMediaOps2);
@@ -53,8 +53,8 @@ Settings::create(bool doublePrecision)
     enableExtension(ClKhrD3d10Sharing);
     enableExtension(ClKhrD3d11Sharing);
 #endif // _WIN32
-	enableExtension(ClKhrImage2dFromBuffer);
-	enableExtension(ClAmdImage2dFromBufferReadOnly);
+    //enableExtension(ClKhrImage2dFromBuffer);
+    //enableExtension(ClAmdImage2dFromBufferReadOnly);
     // Make sure device supports doubles
     doublePrecision_ &= doublePrecision;