diff --git a/g2core/planner.cpp b/g2core/planner.cpp
index 3ebc92f2..8feb4c21 100644
--- a/g2core/planner.cpp
+++ b/g2core/planner.cpp
@@ -594,7 +594,7 @@ bool mp_is_phat_city_time()
 stat_t mp_planner_callback()
 {
     // Edgge case: If there's no runnable buffer, FEEDHOLD_SYNC will never exit
-    if (cm->hold_state == FEEDHOLD_SYNC && !mp_has_runnable_buffer(&mp1)) {
+    if (cm->hold_state == FEEDHOLD_SYNC && cm->cycle_type == CYCLE_NONE) {
         cm->hold_state = FEEDHOLD_MOTION_STOPPED;
     }
     // Test if the planner has transitioned to an IDLE state