diff --git a/common/keyboard_mkbp.c b/common/keyboard_mkbp.c
index 336fd7e0be..3b4a44b76b 100644
--- a/common/keyboard_mkbp.c
+++ b/common/keyboard_mkbp.c
@@ -152,8 +152,9 @@ void keyboard_send_battery_key(void)
 	memcpy(state, keyboard_scan_get_state(), sizeof(state));
 	state[BATTERY_KEY_COL] ^= BATTERY_KEY_ROW_MASK;
 
-	/* Add to FIFO */
-	keyboard_fifo_add(state);
+	/* Add to FIFO only if AP is on or else it will wake from suspend */
+	if (chipset_in_state(CHIPSET_STATE_ON))
+		keyboard_fifo_add(state);
 }
 
 /*****************************************************************************/