diff --git a/src/mainboard/google/kirby/wakeup.c b/src/mainboard/google/kirby/wakeup.c
index 43bad6f4a5..02305b50d3 100644
--- a/src/mainboard/google/kirby/wakeup.c
+++ b/src/mainboard/google/kirby/wakeup.c
@@ -22,6 +22,8 @@
 
 int wakeup_need_reset(void)
 {
-	return 0;
+	/* The "wake up" event is not reliable (known as "bad wakeup") and needs
+	 * reset if the TPM reset mask GPIO value is high. */
+	return gpio_get_value(GPIO_X06);
 }
 
diff --git a/src/mainboard/google/pit/wakeup.c b/src/mainboard/google/pit/wakeup.c
index a82b63299c..02305b50d3 100644
--- a/src/mainboard/google/pit/wakeup.c
+++ b/src/mainboard/google/pit/wakeup.c
@@ -23,7 +23,7 @@
 int wakeup_need_reset(void)
 {
 	/* The "wake up" event is not reliable (known as "bad wakeup") and needs
-	 * reset if GPIO value is high. */
-	return gpio_get_value(GPIO_Y10);
+	 * reset if the TPM reset mask GPIO value is high. */
+	return gpio_get_value(GPIO_X06);
 }