diff --git a/files/initrd/opt/arc/boot.sh b/files/initrd/opt/arc/boot.sh
index c674f932..03a2b3f8 100755
--- a/files/initrd/opt/arc/boot.sh
+++ b/files/initrd/opt/arc/boot.sh
@@ -197,14 +197,6 @@ function bootDSM () {
   CMDLINE_LINE=$(echo "${CMDLINE_LINE}" | sed 's/^ //') # Remove leading space
   echo "${CMDLINE_LINE}" >"${PART1_PATH}/cmdline.yml"
 
-  # Save command line to grubenv
-  if echo "apollolake geminilake purley" | grep -wq "${PLATFORM}"; then
-    if grep -q "^flags.*x2apic.*" /proc/cpuinfo; then
-      checkCmdline "arc_cmdline" "nox2apic" || addCmdline "arc_cmdline" "nox2apic"
-    fi
-  else
-    checkCmdline "arc_cmdline" "nox2apic" && delCmdline "arc_cmdline" "nox2apic"
-  fi
   # Boot
   DIRECTBOOT="$(readConfigKey "directboot" "${USER_CONFIG_FILE}")"
   if [ "${DIRECTBOOT}" == "true" ]; then
diff --git a/files/p1/boot/grub/grub.cfg b/files/p1/boot/grub/grub.cfg
index f4a6363c..24971894 100644
--- a/files/p1/boot/grub/grub.cfg
+++ b/files/p1/boot/grub/grub.cfg
@@ -78,7 +78,7 @@ set menu_color_normal=white/black
 set menu_color_highlight=white/red
 set color_normal=white/black
 
-set ARC_CMDLINE="earlyprintk earlycon=ttyS0,115200 console=ttyS0,115200 root=/dev/ram rootwait pcie_aspm=off net.ifnames=0 ipv6.disable=1"
+set ARC_CMDLINE="earlyprintk earlycon=ttyS0,115200 console=ttyS0,115200 root=/dev/ram rootwait pcie_aspm=off net.ifnames=0 ipv6.disable=1 nox2apic"
 
 search --set=root --label "ARC3"
 if [ -e /automated ]; then