diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index c86fdc1..3c17c04 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -340,7 +340,7 @@
 
 config X86_X2APIC
 	bool "Support x2apic"
-	depends on X86_LOCAL_APIC && X86_64 && IRQ_REMAP
+	depends on X86_LOCAL_APIC && X86_64 && (IRQ_REMAP || HYPERVISOR_GUEST)
 	---help---
 	  This enables x2apic support on CPUs that have this feature.