diff --git a/projects/clr/rocclr/runtime/device/pal/palsettings.cpp b/projects/clr/rocclr/runtime/device/pal/palsettings.cpp
index c76d835ded..44f47a418c 100644
--- a/projects/clr/rocclr/runtime/device/pal/palsettings.cpp
+++ b/projects/clr/rocclr/runtime/device/pal/palsettings.cpp
@@ -302,13 +302,15 @@ Settings::create(
     enableExtension(ClKhrByteAddressableStore);
     enableExtension(ClKhrGlSharing);
     enableExtension(ClKhrGlEvent);
+    enableExtension(ClKhr3DImageWrites);
+    enableExtension(ClKhrImage2dFromBuffer);
     enableExtension(ClAmdMediaOps);
     enableExtension(ClAmdMediaOps2);
+#if !defined(WITH_LIGHTNING_COMPILER)
     enableExtension(ClAmdPopcnt);
-    enableExtension(ClKhr3DImageWrites);
     enableExtension(ClAmdVec3);
     enableExtension(ClAmdPrintf);
-    enableExtension(ClKhrImage2dFromBuffer);
+#endif // !defined(WITH_LIGHTNING_COMPILER)
     // Enable some platform extensions
     enableExtension(ClAmdDeviceAttributeQuery);
     enableExtension(ClKhrSpir);
@@ -332,13 +334,15 @@ Settings::create(
         enableExtension(ClKhrFp64);
     }
 
+#if !defined(WITH_LIGHTNING_COMPILER)
     if (doublePrecision) {
         // Enable AMD double precision extension
         doublePrecision_ = true;
         enableExtension(ClAmdFp64);
     }
+#endif // !defined(WITH_LIGHTNING_COMPILER)
 
-//! @todo 
+//! @todo
 /*
     if (calAttr.totalSDIHeap > 0) {
         //Enable bus addressable memory extension
diff --git a/projects/clr/rocclr/runtime/device/rocm/rocsettings.cpp b/projects/clr/rocclr/runtime/device/rocm/rocsettings.cpp
index e6aa50a3b4..0d1bdebcd5 100644
--- a/projects/clr/rocclr/runtime/device/rocm/rocsettings.cpp
+++ b/projects/clr/rocclr/runtime/device/rocm/rocsettings.cpp
@@ -81,10 +81,12 @@ Settings::create(bool doublePrecision)
     if (doublePrecision_) {
         // Enable KHR double precision extension
         enableExtension(ClKhrFp64);
+#if !defined(WITH_LIGHTNING_COMPILER)
         // Also enable AMD double precision extension?
         enableExtension(ClAmdFp64);
+#endif // !defined(WITH_LIGHTNING_COMPILER)
     }
-    
+
     enableExtension(ClKhrSubGroups);
 
     enableExtension(ClKhrDepthImages);