diff --git a/Marlin/stepper.cpp b/Marlin/stepper.cpp
index 3df97cd52..7695e3c57 100644
--- a/Marlin/stepper.cpp
+++ b/Marlin/stepper.cpp
@@ -93,7 +93,7 @@ volatile unsigned long Stepper::step_events_completed = 0; // The number of step
   unsigned char Stepper::old_OCR0A;
   long  Stepper::final_advance = 0,
         Stepper::old_advance = 0,
-        Stepper::e_steps[4],
+        Stepper::e_steps[EXTRUDERS],
         Stepper::advance_rate,
         Stepper::advance;
 #endif
@@ -661,7 +661,7 @@ void Stepper::init() {
       CBI(TCCR0A, WGM01);
       CBI(TCCR0A, WGM00);
     #endif
-    e_steps[0] = e_steps[1] = e_steps[2] = e_steps[3] = 0;
+    for (uint8_t i = 0; i < EXTRUDERS; i++) e_steps[i] = 0;
     SBI(TIMSK0, OCIE0A);
   #endif //ADVANCE
 
diff --git a/Marlin/stepper.h b/Marlin/stepper.h
index ce4c1c148..13c753fbc 100644
--- a/Marlin/stepper.h
+++ b/Marlin/stepper.h
@@ -91,7 +91,7 @@ class Stepper {
     #endif
 
     #if ENABLED(ADVANCE)
-      static long e_steps[4];
+      static long e_steps[EXTRUDERS];
     #endif
 
   private: