diff --git a/boards/x86/intel_ish/Kconfig.defconfig b/boards/x86/intel_ish/Kconfig.defconfig
index f989dfcd6ed..1f3d6809643 100644
--- a/boards/x86/intel_ish/Kconfig.defconfig
+++ b/boards/x86/intel_ish/Kconfig.defconfig
@@ -16,9 +16,6 @@ config TEST_EXTRA_STACK_SIZE
 	default 1024
 endif # TEST
 
-config HPET_TIMER
-	default y
-
 config SYS_CLOCK_TICKS_PER_SEC
 	default 2048 if HPET_TIMER # HPET is 32768 HZ
 
diff --git a/drivers/timer/Kconfig.x86 b/drivers/timer/Kconfig.x86
index 58d0fc24519..aa5f1a9c6d6 100644
--- a/drivers/timer/Kconfig.x86
+++ b/drivers/timer/Kconfig.x86
@@ -5,6 +5,7 @@
 
 choice
 	prompt "Default System Timer"
+	default HPET_TIMER if SOC_FAMILY_INTEL_ISH || SOC_IA32 || SOC_LAKEMONT
 	default APIC_TSC_DEADLINE_TIMER
 	depends on X86
 	help