diff --git a/arch/x86/kernel/apic.c b/arch/x86/kernel/apic.c
index c3dd64fabcf3fe6b66e5a986383b95baac09e190..38d6aab2358ddad71932ffe3c7e8dc2c0c89318f 100644
--- a/arch/x86/kernel/apic.c
+++ b/arch/x86/kernel/apic.c
@@ -895,6 +895,10 @@ void disable_local_APIC(void)
 {
 	unsigned int value;
 
+	/* APIC hasn't been mapped yet */
+	if (!apic_phys)
+		return;
+
 	clear_local_APIC();
 
 	/*