diff --git a/rocclr/runtime/device/pal/paldefs.hpp b/rocclr/runtime/device/pal/paldefs.hpp
index 8267bc44c2..658eb17418 100644
--- a/rocclr/runtime/device/pal/paldefs.hpp
+++ b/rocclr/runtime/device/pal/paldefs.hpp
@@ -174,7 +174,7 @@ static const AMDDeviceInfo Gfx9PlusSubDeviceInfo[] = {
     /* Raven2 XNACK */{ LIGHTNING_SWITCH("gfx902","gfx903"), LIGHTNING_SWITCH("gfx902","gfx903"),
                         4, 16, 1, 256, 64 * Ki, 32, LIGHTNING_SWITCH(902, 903), true},
     /* Navi10       */{ "", "", 4, 16, 1, 256, 64 * Ki, 32, 1000, false},
-    /* Navi10 XNACK */{ "", "", 4, 16, 1, 256, 64 * Ki, 32, 1001, true},
+    /* Navi10 XNACK */{ "", "", 4, 16, 1, 256, 64 * Ki, 32, 1000, true},
 };
 
 // Supported OpenCL versions
diff --git a/rocclr/runtime/device/pal/paldevice.cpp b/rocclr/runtime/device/pal/paldevice.cpp
index 3a8bb5388a..d98a76c0b4 100644
--- a/rocclr/runtime/device/pal/paldevice.cpp
+++ b/rocclr/runtime/device/pal/paldevice.cpp
@@ -191,7 +191,6 @@ bool NullDevice::init() {
       case 906:
           revision = Pal::AsicRevision::Vega20;
           break;
-      case 1001:
       case 1000:
           revision = Pal::AsicRevision::Navi10;
           break;
diff --git a/rocclr/runtime/device/pal/palprogram.cpp b/rocclr/runtime/device/pal/palprogram.cpp
index 13aee5af1f..2be859a4c3 100644
--- a/rocclr/runtime/device/pal/palprogram.cpp
+++ b/rocclr/runtime/device/pal/palprogram.cpp
@@ -600,8 +600,13 @@ bool HSAILProgram::linkImpl(amd::option::Options* options) {
     if (dev().settings().svmFineGrainSystem_) {
       fin_options.append(" -sc-xnack-iommu");
     }
-    if (dev().settings().gfx10Plus_ && GPU_FORCE_WAVE_SIZE_32) {
-      fin_options.append(" -force-wave-size-32");
+    if (dev().settings().gfx10Plus_) {
+      if (GPU_FORCE_WAVE_SIZE_32) {
+        fin_options.append(" -force-wave-size-32");
+      }
+      if (dev().hwInfo()->xnackEnabled_) {
+        fin_options.append(" -xnack");
+      }
     }
 
     errorCode = aclCompile(dev().compiler(), binaryElf_, fin_options.c_str(), ACL_TYPE_CG,