diff --git a/src/soc/amd/common/block/psp/psp_smm.c b/src/soc/amd/common/block/psp/psp_smm.c
index 671942b0f8..7fade174d7 100644
--- a/src/soc/amd/common/block/psp/psp_smm.c
+++ b/src/soc/amd/common/block/psp/psp_smm.c
@@ -8,6 +8,7 @@
 #include <amdblocks/psp.h>
 #include <amdblocks/smi.h>
 #include <soc/iomap.h>
+#include <spi_flash.h>
 #include <string.h>
 
 #include "psp_def.h"
@@ -93,6 +94,9 @@ int psp_notify_smm(void)
 	if (CONFIG(SOC_AMD_COMMON_BLOCK_PSP_SMI)) {
 		configure_psp_smi();
 		enable_psp_smi();
+
+		/* Probe for SPI flash now as it's likely not busy */
+		assert(boot_device_spi_flash());
 	}
 
 	printk(BIOS_DEBUG, "PSP: Notify SMM info... ");