diff --git a/klippy/mcu.py b/klippy/mcu.py
index fa35c2bf..522fff2f 100644
--- a/klippy/mcu.py
+++ b/klippy/mcu.py
@@ -53,8 +53,8 @@ class MCU_endstop:
             "endstop_query_state oid=%c", cq=cmd_queue)
         self._query_cmd = self._mcu.lookup_query_command(
             "endstop_query_state oid=%c",
-            "endstop_state oid=%c homing=%c pin_value=%c", oid=self._oid,
-            cq=cmd_queue)
+            "endstop_state oid=%c homing=%c next_clock=%u pin_value=%c",
+            oid=self._oid, cq=cmd_queue)
     def home_start(self, print_time, sample_time, sample_count, rest_time,
                    triggered=True):
         clock = self._mcu.print_time_to_clock(print_time)
diff --git a/src/endstop.c b/src/endstop.c
index 9c2f833e..96f8e805 100644
--- a/src/endstop.c
+++ b/src/endstop.c
@@ -132,10 +132,11 @@ endstop_report(uint8_t oid, struct endstop *e)
     irq_disable();
     uint8_t eflags = e->flags;
     e->flags &= ~ESF_REPORT;
+    uint32_t nextwake = e->nextwake;
     irq_enable();
 
-    sendf("endstop_state oid=%c homing=%c pin_value=%c"
-          , oid, !!(eflags & ESF_HOMING), gpio_in_read(e->pin));
+    sendf("endstop_state oid=%c homing=%c next_clock=%u pin_value=%c"
+          , oid, !!(eflags & ESF_HOMING), nextwake, gpio_in_read(e->pin));
 }
 
 void