diff --git a/Firmware/stepper.cpp b/Firmware/stepper.cpp
index 6e0937cfd..c7105da74 100644
--- a/Firmware/stepper.cpp
+++ b/Firmware/stepper.cpp
@@ -354,10 +354,10 @@ FORCE_INLINE void stepper_next_block()
         max_adv_steps = current_block->max_adv_steps;
         e_step_loops = current_block->advance_step_loops;
     } else {
-        e_steps = 0;
         e_step_loops = 1;
         current_adv_steps = 0;
     }
+    e_steps = 0;
     nextAdvanceISR = ADV_NEVER;
     LA_phase = -1;
 #endif