diff --git a/src/soc/amd/picasso/Kconfig b/src/soc/amd/picasso/Kconfig
index bd3682220c..5c682dbec8 100644
--- a/src/soc/amd/picasso/Kconfig
+++ b/src/soc/amd/picasso/Kconfig
@@ -58,6 +58,7 @@ config CPU_SPECIFIC_OPTIONS
 	select UDK_2017_BINDING
 	select HAVE_CF9_RESET
 	select SUPPORT_CPU_UCODE_IN_CBFS
+	select NO_CBFS_MCACHE if VBOOT_STARTS_BEFORE_BOOTBLOCK
 
 config FSP_M_FILE
 	string "FSP-M (memory init) binary path and filename"