diff --git a/projects/clr/rocclr/device/pal/paldefs.hpp b/projects/clr/rocclr/device/pal/paldefs.hpp
index e64d5afcc1..6c9d4b0acd 100644
--- a/projects/clr/rocclr/device/pal/paldefs.hpp
+++ b/projects/clr/rocclr/device/pal/paldefs.hpp
@@ -202,20 +202,22 @@ static constexpr AMDDeviceInfo Gfx9PlusSubDeviceInfo[] = {
     /* Navi12LiteXNACK */ UnknownDevice,
     /* Navi14          */ {"gfx1012", "gfx1012", 32, 256, 32, 1012, 1012, false},
     /* Navi14 XNACK    */ {"gfx1012", "gfx1012", 32, 256, 32, 1012, 1012, true},
-    /* UnknownDevice3          */ UnknownDevice,
-    /* UnknownDevice3 XNACK    */ UnknownDevice,
-    /* UnknownDevice4          */ UnknownDevice,
-    /* UnknownDevice4 XNACK    */ UnknownDevice,
-    /* UnknownDevice5          */ UnknownDevice,
-    /* UnknownDevice5 XNACK    */ UnknownDevice,
-    /* UnknownDevice2      */ UnknownDevice,
-    /* UnknownDevice2XNACK */ UnknownDevice,
-    /* UnknownDevice7           */ UnknownDevice,
-    /* UnknownDevice7 XNACK     */ UnknownDevice,
-    /* UnknownDevice6       */ UnknownDevice,
-    /* UnknownDevice6 XNACK */ UnknownDevice,
-    /* UnknownDevice1        */ UnknownDevice,
-    /* UnknownDevice1 XNACK  */ UnknownDevice,
+    /* UnknownDevice       */ UnknownDevice,
+    /* UnknownDevice XNACK */ UnknownDevice,
+    /* UnknownDevice       */ UnknownDevice,
+    /* UnknownDevice XNACK */ UnknownDevice,
+    /* UnknownDevice       */ UnknownDevice,
+    /* UnknownDevice XNACK */ UnknownDevice,
+    /* UnknownDevice       */ UnknownDevice,
+    /* UnknownDevice XNACK */ UnknownDevice,
+    /* UnknownDevice       */ UnknownDevice,
+    /* UnknownDevice XNACK */ UnknownDevice,
+    /* UnknownDevice       */ UnknownDevice,
+    /* UnknownDevice XNACK */ UnknownDevice,
+    /* UnknownDevice       */ UnknownDevice,
+    /* UnknownDevice XNACK */ UnknownDevice,
+    /* UnknownDevice       */ UnknownDevice,
+    /* UnknownDevice XNACK */ UnknownDevice,
 };
 
 // Supported OpenCL versions
diff --git a/projects/clr/rocclr/device/pal/paldevice.cpp b/projects/clr/rocclr/device/pal/paldevice.cpp
index d88eb7c475..cb1cd809e7 100644
--- a/projects/clr/rocclr/device/pal/paldevice.cpp
+++ b/projects/clr/rocclr/device/pal/paldevice.cpp
@@ -203,6 +203,12 @@ bool NullDevice::init() {
             ShouldNotReachHere();
             break;
         }
+      case 11:
+        switch (ipLevelMinor) {
+          case 0:
+            ShouldNotReachHere();
+            break;
+        }
     }
 
     Pal::AsicRevision revision = Pal::AsicRevision::Unknown;
@@ -255,6 +261,9 @@ bool NullDevice::init() {
       case 1040:
         ShouldNotReachHere();
         break;
+      case 1100:
+        ShouldNotReachHere();
+        break;
     }
 
     NullDevice* dev = new NullDevice();