diff --git a/src/southbridge/intel/bd82x6x/lpc.c b/src/southbridge/intel/bd82x6x/lpc.c
index 2004632..038bb37 100644
--- a/src/southbridge/intel/bd82x6x/lpc.c
+++ b/src/southbridge/intel/bd82x6x/lpc.c
@@ -404,7 +404,7 @@
 
 static void pch_set_acpi_mode(void)
 {
-	if (!acpi_is_wakeup_s3() && CONFIG(HAVE_SMI_HANDLER)) {
+	if (!acpi_is_wakeup_s3()) {
 		apm_control(APM_CNT_ACPI_DISABLE);
 	}
 }
@@ -822,11 +822,9 @@
 	spi_finalize_ops();
 
 	/* Call SMM finalize() handlers before resume */
-	if (CONFIG(HAVE_SMI_HANDLER)) {
-		if (CONFIG(INTEL_CHIPSET_LOCKDOWN) ||
-		    acpi_is_wakeup_s3()) {
-			apm_control(APM_CNT_FINALIZE);
-		}
+	if (CONFIG(INTEL_CHIPSET_LOCKDOWN) ||
+	    acpi_is_wakeup_s3()) {
+		apm_control(APM_CNT_FINALIZE);
 	}
 }