diff --git a/src/soc/amd/common/block/lpc/lpc.c b/src/soc/amd/common/block/lpc/lpc.c
index 1d019a3..2586ba9 100644
--- a/src/soc/amd/common/block/lpc/lpc.c
+++ b/src/soc/amd/common/block/lpc/lpc.c
@@ -28,7 +28,9 @@
 	u8 byte;
 
 	/* Set up SERIRQ, enable continuous mode */
-	byte = (PM_SERIRQ_NUM_BITS_21 | PM_SERIRQ_ENABLE);
+	byte = PM_SERIRQ_NUM_BITS_21;
+	if (!CONFIG(SOC_AMD_COMMON_BLOCK_USE_ESPI))
+		byte |= PM_SERIRQ_ENABLE;
 	if (!CONFIG(SERIRQ_CONTINUOUS_MODE))
 		byte |= PM_SERIRQ_MODE;
 
@@ -91,8 +93,7 @@
 	/* Initialize i8254 timers */
 	setup_i8254();
 
-	if (!CONFIG(SOC_AMD_COMMON_BLOCK_USE_ESPI))
-		setup_serirq();
+	setup_serirq();
 }
 
 static void lpc_read_resources(struct device *dev)