diff --git a/projects/clr/rocclr/runtime/device/gpu/gpusettings.cpp b/projects/clr/rocclr/runtime/device/gpu/gpusettings.cpp
index 50f2fd1447..7e6e6341b9 100644
--- a/projects/clr/rocclr/runtime/device/gpu/gpusettings.cpp
+++ b/projects/clr/rocclr/runtime/device/gpu/gpusettings.cpp
@@ -338,9 +338,6 @@ Settings::create(
 
         rectLinearDMA_  = true;
 
-        if (oclVersion_ >= OpenCL20) {
-            //enableExtension(ClKhrGLDepthImages);
-        }
         if (AMD_THREAD_TRACE_ENABLE) {
             threadTraceEnable_ = true;
         }
@@ -431,6 +428,7 @@ Settings::create(
 
     // Enable some OpenCL 2.0 extensions
     if (oclVersion_ >= OpenCL20) {
+        enableExtension(ClKhrGLDepthImages);
         enableExtension(ClKhrSubGroups);
         enableExtension(ClKhrDepthImages);
 
diff --git a/projects/clr/rocclr/runtime/platform/memory.cpp b/projects/clr/rocclr/runtime/platform/memory.cpp
index 8e35fe9764..7f4af7b21c 100644
--- a/projects/clr/rocclr/runtime/platform/memory.cpp
+++ b/projects/clr/rocclr/runtime/platform/memory.cpp
@@ -999,7 +999,8 @@ Image::numSupportedFormats(const Context& context, cl_mem_object_type image_type
         if (devices[i]->settings().supportDepthsRGB_) {
             supportDepthsRGB = true;
         }
-        if (devices[i]->settings().checkExtension(ClKhrGLDepthImages)) {
+        if (devices[i]->settings().checkExtension(ClKhrGLDepthImages) &&
+            (context.info().flags_ & Context::GLDeviceKhr)) {
             supportDepthStencil = true;
         }
     }