diff --git a/projects/clr/rocclr/runtime/device/gpu/gpusettings.cpp b/projects/clr/rocclr/runtime/device/gpu/gpusettings.cpp
index 4cdfab71f4..7cf23e23bd 100644
--- a/projects/clr/rocclr/runtime/device/gpu/gpusettings.cpp
+++ b/projects/clr/rocclr/runtime/device/gpu/gpusettings.cpp
@@ -398,11 +398,6 @@ Settings::create(
     enableExtension(ClAmdMediaOps);
     enableExtension(ClAmdMediaOps2);
     enableExtension(ClAmdPopcnt);
-#if defined(_WIN32)
-    enableExtension(ClKhrD3d9Sharing);
-    enableExtension(ClKhrD3d10Sharing);
-    enableExtension(ClKhrD3d11Sharing);
-#endif // _WIN32
     enableExtension(ClKhr3DImageWrites);
     enableExtension(ClAmdVec3);
     enableExtension(ClAmdPrintf);
@@ -464,6 +459,15 @@ Settings::create(
 
     enableExtension(ClKhrSpir);
 
+    // SVM is not currently supported for DX Interop
+    if (!svmFineGrainSystem_) {
+#if defined(_WIN32)
+        enableExtension(ClKhrD3d9Sharing);
+        enableExtension(ClKhrD3d10Sharing);
+        enableExtension(ClKhrD3d11Sharing);
+#endif // _WIN32
+    }
+
     // Enable some OpenCL 2.0 extensions
     if (oclVersion_ >= OpenCL20) {
         enableExtension(ClKhrGLDepthImages);