diff --git a/common/gaia_power.c b/common/gaia_power.c
index 7e381c5868..110157481c 100644
--- a/common/gaia_power.c
+++ b/common/gaia_power.c
@@ -93,6 +93,12 @@ static void wait_for_power_off(void)
 				 TASK_EVENT_TIMER))
 					return;
 		}
+
+		/*
+		 * Holding down the power button causes this loop to spin
+		 * endlessly, triggering the watchdog. So add a wait here.
+		 */
+		task_wait_event(-1);
 	}
 }