diff --git a/src/soc/intel/broadwell/finalize.c b/src/soc/intel/broadwell/finalize.c
index 4f7a5181ab..bf77a87a10 100644
--- a/src/soc/intel/broadwell/finalize.c
+++ b/src/soc/intel/broadwell/finalize.c
@@ -100,6 +100,9 @@ static void broadwell_finalize(void *unused)
 	reg_script_run_on_dev(SA_DEV_ROOT, system_agent_finalize_script);
 	reg_script_run_on_dev(PCH_DEV_LPC, pch_finalize_script);
 
+	/* Lock */
+	RCBA32_OR(0x3a6c, 0x00000001);
+
 	/* Read+Write the following registers */
 	MCHBAR32(0x6030) = MCHBAR32(0x6030);
 	MCHBAR32(0x6034) = MCHBAR32(0x6034);
diff --git a/src/soc/intel/broadwell/lpc.c b/src/soc/intel/broadwell/lpc.c
index 0e5a2605ac..d7a3e82747 100644
--- a/src/soc/intel/broadwell/lpc.c
+++ b/src/soc/intel/broadwell/lpc.c
@@ -350,8 +350,6 @@ static void pch_pm_init(struct device *dev)
 	if (RCBA32(FD) & PCH_DISABLE_ADSPD)
 		RCBA32_OR(0x2b1c, (1 << 29));
 
-	/* Lock */
-	RCBA32_OR(0x3a6c, 0x00000001);
 }
 
 static void pch_cg_init(device_t dev)