diff --git a/g2core/cycle_feedhold.cpp b/g2core/cycle_feedhold.cpp
index 7bbfa499..f1d793b7 100644
--- a/g2core/cycle_feedhold.cpp
+++ b/g2core/cycle_feedhold.cpp
@@ -830,7 +830,7 @@ static stat_t _feedhold_restart_with_actions()   // Execute Cases (6) and (7)
 
     // Check to run first-time code
     if (cm1.hold_state == FEEDHOLD_HOLD) {
-        if (!coolant_ready() || !spindle_ready_to_resume()) {
+        if (!coolant_ready() || (spindle_is_on_or_paused() && !spindle_ready_to_resume())) {
             return (STAT_EAGAIN);
         }