diff --git a/src/soc/amd/cezanne/cpu.c b/src/soc/amd/cezanne/cpu.c
index adc99d0ba6..818e4d8a83 100644
--- a/src/soc/amd/cezanne/cpu.c
+++ b/src/soc/amd/cezanne/cpu.c
@@ -11,6 +11,7 @@
 #include <cpu/x86/mp.h>
 #include <cpu/x86/mtrr.h>
 #include <cpu/x86/smm.h>
+#include <acpi/acpi.h>
 #include <device/device.h>
 #include <soc/cpu.h>
 #include <soc/iomap.h>
@@ -37,7 +38,10 @@ static void pre_mp_init(void)
 static void post_mp_init(void)
 {
 	global_smi_enable();
-	apm_control(APM_CNT_SMMINFO);
+
+	/* SMMINFO only needs to be set up when booting from S5 */
+	if (!acpi_is_wakeup_s3())
+		apm_control(APM_CNT_SMMINFO);
 }
 
 static const struct mp_ops mp_ops = {