diff --git a/src/cpu/x86/mp_init.c b/src/cpu/x86/mp_init.c
index 9b5c23036f..46cb585d55 100644
--- a/src/cpu/x86/mp_init.c
+++ b/src/cpu/x86/mp_init.c
@@ -1076,7 +1076,9 @@ static void fill_mp_state(struct mp_state *state, const struct mp_ops *ops)
 		ops->get_smm_info(&state->perm_smbase, &state->perm_smsize,
 					&state->smm_real_save_state_size);
 
-	state->smm_save_state_size = MAX(state->smm_real_save_state_size, smm_stub_size());
+	if (CONFIG(HAVE_SMI_HANDLER))
+		state->smm_save_state_size = MAX(state->smm_real_save_state_size,
+						 smm_stub_size());
 
 	/*
 	 * Make sure there is enough room for the SMM descriptor