diff --git a/grbllib.c b/grbllib.c
index f2c5f294..dd080e8f 100644
--- a/grbllib.c
+++ b/grbllib.c
@@ -260,7 +260,7 @@ int grbl_enter (void)
 
     if((driver.spindle = spindle_select(settings.spindle.flags.type))) {
         spindle_ptrs_t *spindle = spindle_get(0);
-        driver.spindle = spindle->get_pwm == NULL || spindle->update_pwm != NULL;
+        driver.spindle = spindle->get_pwm == NULL || spindle->update_pwm != NULL || spindle->update_rpm != NULL;
     } else
         driver.spindle = spindle_select(spindle_add_null());