diff --git a/src/soc/amd/common/block/include/amdblocks/ioapic.h b/src/soc/amd/common/block/include/amdblocks/ioapic.h
index 4c10a84a03..bd1c363242 100644
--- a/src/soc/amd/common/block/include/amdblocks/ioapic.h
+++ b/src/soc/amd/common/block/include/amdblocks/ioapic.h
@@ -3,7 +3,8 @@
 #ifndef AMD_BLOCK_IOAPIC_H
 #define AMD_BLOCK_IOAPIC_H
 
-#define FCH_IOAPIC_ID		CONFIG_MAX_CPUS
-#define GNB_IOAPIC_ID		(CONFIG_MAX_CPUS + 1)
+/* Since the old APIC bus isn't used any more, the IOAPIC IDs can be < CONFIG_MAX_CPUS */
+#define FCH_IOAPIC_ID		0
+#define GNB_IOAPIC_ID		1
 
 #endif /* AMD_BLOCK_IOAPIC_H */