diff --git a/src/soc/intel/pantherlake/fsp_params.c b/src/soc/intel/pantherlake/fsp_params.c
index dfc47c6988..a78059d512 100644
--- a/src/soc/intel/pantherlake/fsp_params.c
+++ b/src/soc/intel/pantherlake/fsp_params.c
@@ -3,6 +3,7 @@
 #include <bootmode.h>
 #include <cpu/intel/microcode.h>
 #include <fsp/api.h>
+#include <fsp/debug.h>
 #include <fsp/fsp_debug_event.h>
 #include <fsp/fsp_gop_blt.h>
 #include <fsp/ppi/mp_service_ppi.h>
@@ -685,7 +686,7 @@ static void arch_silicon_init_params(FSPS_ARCH2_UPD *s_arch_cfg)
 	/* Assign FspEventHandler arch Upd to use coreboot debug event handler */
 	if (CONFIG(FSP_USES_CB_DEBUG_EVENT_HANDLER)
 	    && CONFIG(CONSOLE_SERIAL)
-	    && CONFIG(FSP_ENABLE_SERIAL_DEBUG))
+	    && CONFIG(FSP_ENABLE_SERIAL_DEBUG) && fsp_get_pcd_debug_log_level())
 		s_arch_cfg->FspEventHandler = (uintptr_t)((FSP_EVENT_HANDLER *)
 							  fsp_debug_event_handler);
 
diff --git a/src/soc/intel/pantherlake/romstage/fsp_params.c b/src/soc/intel/pantherlake/romstage/fsp_params.c
index 2bb4d21c6a..7d965fd496 100644
--- a/src/soc/intel/pantherlake/romstage/fsp_params.c
+++ b/src/soc/intel/pantherlake/romstage/fsp_params.c
@@ -2,6 +2,7 @@
 
 #include <cpu/intel/common/common.h>
 #include <cpu/x86/msr.h>
+#include <fsp/debug.h>
 #include <fsp/fsp_debug_event.h>
 #include <fsp/util.h>
 #include <intelblocks/cpulib.h>
@@ -320,9 +321,12 @@ static void fsp_control_log_level(FSPM_UPD *mupd, bool is_enabled)
 	FSP_M_CONFIG *m_cfg = &mupd->FspmConfig;
 	FSPM_ARCHx_UPD *arch_upd = &mupd->FspmArchUpd;
 
-	enum fsp_log_level log_level = is_enabled ? fsp_map_console_log_level() :
-		 FSP_LOG_LEVEL_DISABLE;
-	fsp_set_debug_level(m_cfg, log_level, log_level);
+	enum fsp_log_level fsp_log_level = is_enabled ? fsp_get_pcd_debug_log_level() :
+			 FSP_LOG_LEVEL_DISABLE;
+	enum fsp_log_level mrc_log_level = is_enabled ? fsp_get_mrc_debug_log_level() :
+			 FSP_LOG_LEVEL_DISABLE;
+
+	fsp_set_debug_level(m_cfg, fsp_log_level, mrc_log_level);
 
 	if ((m_cfg->PcdSerialDebugLevel > FSP_LOG_LEVEL_VERBOSE) ||
 	    (m_cfg->SerialDebugMrcLevel > FSP_LOG_LEVEL_VERBOSE)) {