diff --git a/g2core/spindle.cpp b/g2core/spindle.cpp
index f1b7d0dc..e7e663da 100644
--- a/g2core/spindle.cpp
+++ b/g2core/spindle.cpp
@@ -427,6 +427,7 @@ bool spindle_speed_ramp_from_systick() {
     } else {
         spindle.speed_actual = 0;
         pwm_set_duty(PWM_1, _get_spindle_pwm(spindle, pwm));
+        done = cm->hold_state != FEEDHOLD_OFF;
     }
     return done;
 #else