diff --git a/FluidNC/src/Machine/Axes.cpp b/FluidNC/src/Machine/Axes.cpp
index 336c4a8dc..ae7dc8121 100644
--- a/FluidNC/src/Machine/Axes.cpp
+++ b/FluidNC/src/Machine/Axes.cpp
@@ -66,9 +66,10 @@ namespace Machine {
 
         _sharedStepperDisable.synchronousWrite(disable);
 
-        if (!disable) { // wait for the enable delay
+        if (!disable && config->_stepping->_disableDelayUsecs) {  // wait for the enable delay
+            log_debug("enable delay:" << config->_stepping->_disableDelayUsecs);
             delay_us(config->_stepping->_disableDelayUsecs);
-        } 
+        }
     }
 
     // Put the motors in the given axes into homing mode, returning a
diff --git a/FluidNC/src/Stepping.cpp b/FluidNC/src/Stepping.cpp
index d677cfd6f..631c47687 100644
--- a/FluidNC/src/Stepping.cpp
+++ b/FluidNC/src/Stepping.cpp
@@ -138,7 +138,7 @@ namespace Machine {
         handler.item("idle_ms", _idleMsecs, 0, 10000000);  // full range
         handler.item("pulse_us", _pulseUsecs, 0, 30);
         handler.item("dir_delay_us", _directionDelayUsecs, 0, 10);
-        handler.item("disable_delay_us", _disableDelayUsecs, 0, 10);
+        handler.item("disable_delay_us", _disableDelayUsecs, 0, 1000000);  // max 1 second
         handler.item("segments", _segments, 6, 20);
     }