diff --git a/src/soc/intel/common/block/acpi/acpi.c b/src/soc/intel/common/block/acpi/acpi.c
index cf62cccfa7..d7a0e8e5ec 100644
--- a/src/soc/intel/common/block/acpi/acpi.c
+++ b/src/soc/intel/common/block/acpi/acpi.c
@@ -19,6 +19,7 @@
 #include <soc/gpio.h>
 #include <soc/iomap.h>
 #include <soc/pm.h>
+#include <cpu/x86/lapic.h>
 
 #define  CPUID_6_EAX_ISST	(1 << 7)
 
@@ -80,6 +81,10 @@ static unsigned long acpi_madt_irq_overrides(unsigned long current)
 	/* NMI */
 	current += acpi_create_madt_lapic_nmi((acpi_madt_lapic_nmi_t *)current, 0xff, 5, 1);
 
+	if (is_x2apic_mode())
+		current += acpi_create_madt_lx2apic_nmi((acpi_madt_lx2apic_nmi_t *)current,
+				0xff, 0xd, 1);
+
 	return current;
 }