diff --git a/board/cr50/board.c b/board/cr50/board.c
index 12b0c58773..f68a37543c 100644
--- a/board/cr50/board.c
+++ b/board/cr50/board.c
@@ -117,7 +117,7 @@ void pmu_wakeup_interrupt(void)
 		 * Delay sleep long enough for a SPI slave transaction to start
 		 * or for the system to be reset.
 		 */
-		delay_sleep_by(3 * SECOND);
+		delay_sleep_by(3 * MINUTE);
 
 		if (!gpio_get_level(GPIO_SYS_RST_L_IN))
 			sys_rst_asserted(GPIO_SYS_RST_L_IN);
diff --git a/chip/g/idle.c b/chip/g/idle.c
index 23524aae15..88a2c14eaa 100644
--- a/chip/g/idle.c
+++ b/chip/g/idle.c
@@ -4,6 +4,7 @@
  */
 
 #include "common.h"
+#include "timer.h"
 #include "console.h"
 #include "rdd.h"
 #include "registers.h"
@@ -172,6 +173,9 @@ void __idle(void)
 		GREG32(PMU, PWRDN_SCRATCH17) = idle_action;
 	}
 
+	/* Disable sleep until 3 minutes after init */
+	delay_sleep_by(3 * MINUTE);
+
 	while (1) {
 
 		/* Anyone still busy? */