diff --git a/src/soc/intel/cannonlake/Kconfig b/src/soc/intel/cannonlake/Kconfig
index 4a084a347d..f85cd156c3 100644
--- a/src/soc/intel/cannonlake/Kconfig
+++ b/src/soc/intel/cannonlake/Kconfig
@@ -109,6 +109,7 @@ config CPU_SPECIFIC_OPTIONS
 
 config DISABLE_HECI1_AT_PRE_BOOT
 	default y if MAINBOARD_HAS_CHROMEOS
+	select HECI_DISABLE_USING_SMM
 
 config MAX_CPUS
 	int
diff --git a/src/soc/intel/cannonlake/smihandler.c b/src/soc/intel/cannonlake/smihandler.c
index ac25990821..88b58e8607 100644
--- a/src/soc/intel/cannonlake/smihandler.c
+++ b/src/soc/intel/cannonlake/smihandler.c
@@ -16,7 +16,7 @@
  */
 void smihandler_soc_at_finalize(void)
 {
-	if (CONFIG(DISABLE_HECI1_AT_PRE_BOOT) && CONFIG(HECI_DISABLE_USING_SMM))
+	if (CONFIG(DISABLE_HECI1_AT_PRE_BOOT))
 		heci1_disable();
 }