diff --git a/Kconfig b/Kconfig
index 34d11d2cf5..ad0bd71a62 100644
--- a/Kconfig
+++ b/Kconfig
@@ -209,6 +209,7 @@ config FIT_SIGNATURE
 	bool "Enable signature verification of FIT uImages"
 	depends on DM
 	select RSA
+	select CONSOLE_DISABLE_CLI
 	help
 	  This option enables signature verification of FIT uImages,
 	  using a hash signed and verified using RSA. If
diff --git a/common/Kconfig b/common/Kconfig
index 4a76d02ad5..59ad5fd411 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -252,8 +252,7 @@ config CONSOLE_RECORD_IN_SIZE
 
 config CONSOLE_DISABLE_CLI
 	bool "disable ctrlc"
-	depends on BOOTDELAY = 0
-	default y if AVB_VBMETA_PUBLIC_KEY_VALIDATE || FIT_SIGNATURE
+	default n
 	help
 	  This disable CLI interactive in verified-boot.
 
diff --git a/lib/avb/libavb_user/Kconfig b/lib/avb/libavb_user/Kconfig
index 33dff1bc79..38920941c8 100755
--- a/lib/avb/libavb_user/Kconfig
+++ b/lib/avb/libavb_user/Kconfig
@@ -9,6 +9,7 @@ config AVB_LIBAVB_USER
 config AVB_VBMETA_PUBLIC_KEY_VALIDATE
 	bool "Support vbmeta public key validate"
 	depends on AVB_LIBAVB_USER
+	select CONSOLE_DISABLE_CLI
 	help
 	  support vbmeta public key validate, system bootflow would be
 	  uninterruptale when it is enabled: