diff --git a/projects/clr/rocclr/runtime/device/pal/paldefs.hpp b/projects/clr/rocclr/runtime/device/pal/paldefs.hpp
index b5c736ce76..4bf9ba0ce3 100644
--- a/projects/clr/rocclr/runtime/device/pal/paldefs.hpp
+++ b/projects/clr/rocclr/runtime/device/pal/paldefs.hpp
@@ -189,6 +189,10 @@ static constexpr AMDDeviceInfo Gfx9PlusSubDeviceInfo[] = {
     /* UnknownDevice3 XNACK    */ UnknownDevice,
     /* UnknownDevice2      */ UnknownDevice,
     /* UnknownDevice2XNACK */ UnknownDevice,
+    /* UnknownDevice7           */ UnknownDevice,
+    /* UnknownDevice7 XNACK     */ UnknownDevice,
+    /* UnknownDevice6       */ UnknownDevice,
+    /* UnknownDevice6 XNACK */ UnknownDevice,
 };
 
 // Supported OpenCL versions
diff --git a/projects/clr/rocclr/runtime/device/pal/paldevice.cpp b/projects/clr/rocclr/runtime/device/pal/paldevice.cpp
index b4e0cb81f0..7c2e71ec6c 100644
--- a/projects/clr/rocclr/runtime/device/pal/paldevice.cpp
+++ b/projects/clr/rocclr/runtime/device/pal/paldevice.cpp
@@ -183,6 +183,9 @@ bool NullDevice::init() {
           case 3:
             ShouldNotReachHere();
             break;
+          case 4:
+            ShouldNotReachHere();
+            break;
         }
     }
 
@@ -224,6 +227,9 @@ bool NullDevice::init() {
       case 1030:
         ShouldNotReachHere();
         break;
+      case 1040:
+        ShouldNotReachHere();
+        break;
     }
 
     NullDevice* dev = new NullDevice();