diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index e9ac6e9dfbcb..591b0a7abfd2 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -2508,7 +2508,7 @@ config MITIGATION_RFDS
 choice
 	prompt "Clear branch history"
 	depends on CPU_SUP_INTEL
-	default SPECTRE_BHI_AUTO
+	default SPECTRE_BHI_ON
 	help
 	  Enable BHI mitigations. BHI attacks are a form of Spectre V2 attacks
 	  where the branch history buffer is poisoned to speculatively steer