diff --git a/Firmware/bigtreetech-manta-m4p.cfg b/Firmware/bigtreetech-manta-m4p.cfg
index b3468f4c..445dc093 100644
--- a/Firmware/bigtreetech-manta-m4p.cfg
+++ b/Firmware/bigtreetech-manta-m4p.cfg
@@ -372,8 +372,8 @@ gcode:
     G91
     G1 X-10 F1200
     
-    # Wait just a second… (give StallGuard registers time to clear)
-    G4 P1000
+    # Wait for StallGuard registers to clear
+    M400
     G90
     # Set current during print
     SET_TMC_CURRENT STEPPER=stepper_x CURRENT={RUN_CURRENT_X}
@@ -394,8 +394,8 @@ gcode:
     G91
     G1 Y-10 F1200
 
-    # Wait just a second… (give StallGuard registers time to clear)
-    G4 P1000
+    # Wait for StallGuard registers to clear
+    M400
     G90
     # Set current during print
     SET_TMC_CURRENT STEPPER=stepper_x CURRENT={RUN_CURRENT_X}
diff --git a/Firmware/bigtreetech-skr-3-ez.cfg b/Firmware/bigtreetech-skr-3-ez.cfg
index 02cac2bb..03bf548d 100644
--- a/Firmware/bigtreetech-skr-3-ez.cfg
+++ b/Firmware/bigtreetech-skr-3-ez.cfg
@@ -418,8 +418,8 @@ gcode:
     G91
     G1 X-10 F1200
     
-    # Wait just a second… (give StallGuard registers time to clear)
-    G4 P1000
+    # Wait for StallGuard registers to clear
+    M400
     G90
     # Set current during print
     SET_TMC_CURRENT STEPPER=stepper_x CURRENT={RUN_CURRENT_X}
@@ -440,8 +440,8 @@ gcode:
     G91
     G1 Y-10 F1200
 
-    # Wait just a second… (give StallGuard registers time to clear)
-    G4 P1000
+    # Wait for StallGuard registers to clear
+    M400
     G90
     # Set current during print
     SET_TMC_CURRENT STEPPER=stepper_x CURRENT={RUN_CURRENT_X}
diff --git a/Firmware/bigtreetech-skr-mini-e3-v2.0.cfg b/Firmware/bigtreetech-skr-mini-e3-v2.0.cfg
index 7a74b66e..e0d05120 100644
--- a/Firmware/bigtreetech-skr-mini-e3-v2.0.cfg
+++ b/Firmware/bigtreetech-skr-mini-e3-v2.0.cfg
@@ -336,8 +336,8 @@ gcode:
     G91
     G1 X-10 F1200
     
-    # Wait just a second… (give StallGuard registers time to clear)
-    G4 P1000
+    # Wait for StallGuard registers to clear
+    M400
     G90
     # Set current during print
     SET_TMC_CURRENT STEPPER=stepper_x CURRENT={RUN_CURRENT_X}
@@ -358,8 +358,8 @@ gcode:
     G91
     G1 Y-10 F1200
 
-    # Wait just a second… (give StallGuard registers time to clear)
-    G4 P1000
+    # Wait for StallGuard registers to clear
+    M400
     G90
     # Set current during print
     SET_TMC_CURRENT STEPPER=stepper_x CURRENT={RUN_CURRENT_X}
diff --git a/Firmware/bigtreetech-skr-mini-e3-v3.0.cfg b/Firmware/bigtreetech-skr-mini-e3-v3.0.cfg
index e4330051..53e95f8b 100644
--- a/Firmware/bigtreetech-skr-mini-e3-v3.0.cfg
+++ b/Firmware/bigtreetech-skr-mini-e3-v3.0.cfg
@@ -389,8 +389,8 @@ gcode:
     G91
     G1 X-10 F1200
     
-    # Wait just a second… (give StallGuard registers time to clear)
-    G4 P1000
+    # Wait for StallGuard registers to clear
+    M400
     G90
     # Set current during print
     SET_TMC_CURRENT STEPPER=stepper_x CURRENT={RUN_CURRENT_X}
@@ -411,8 +411,8 @@ gcode:
     G91
     G1 Y-10 F1200
 
-    # Wait just a second… (give StallGuard registers time to clear)
-    G4 P1000
+    # Wait for StallGuard registers to clear
+    M400
     G90
     # Set current during print
     SET_TMC_CURRENT STEPPER=stepper_x CURRENT={RUN_CURRENT_X}
diff --git a/Firmware/bigtreetech-skr-pico-v1.0.cfg b/Firmware/bigtreetech-skr-pico-v1.0.cfg
index 3582c9ea..3573e38a 100644
--- a/Firmware/bigtreetech-skr-pico-v1.0.cfg
+++ b/Firmware/bigtreetech-skr-pico-v1.0.cfg
@@ -400,8 +400,8 @@ gcode:
     G91
     G1 X-10 F1200
     
-    # Wait just a second… (give StallGuard registers time to clear)
-    G4 P1000
+    # Wait for StallGuard registers to clear
+    M400
     G90
     # Set current during print
     SET_TMC_CURRENT STEPPER=stepper_x CURRENT={RUN_CURRENT_X}
@@ -422,8 +422,8 @@ gcode:
     G91
     G1 Y-10 F1200
 
-    # Wait just a second… (give StallGuard registers time to clear)
-    G4 P1000
+    # Wait for StallGuard registers to clear
+    M400
     G90
     # Set current during print
     SET_TMC_CURRENT STEPPER=stepper_x CURRENT={RUN_CURRENT_X}
diff --git a/Firmware/fysetc-cheetah-v2.0.cfg b/Firmware/fysetc-cheetah-v2.0.cfg
index 6665d08d..fa0b414c 100644
--- a/Firmware/fysetc-cheetah-v2.0.cfg
+++ b/Firmware/fysetc-cheetah-v2.0.cfg
@@ -399,8 +399,8 @@ gcode:
     G91
     G1 X-10 F1200
     
-    # Wait just a second… (give StallGuard registers time to clear)
-    G4 P1000
+    # Wait for StallGuard registers to clear
+    M400
     G90
     # Set current during print
     SET_TMC_CURRENT STEPPER=stepper_x CURRENT={RUN_CURRENT_X}
@@ -421,8 +421,8 @@ gcode:
     G91
     G1 Y-10 F1200
 
-    # Wait just a second… (give StallGuard registers time to clear)
-    G4 P1000
+    # Wait for StallGuard registers to clear
+    M400
     G90
     # Set current during print
     SET_TMC_CURRENT STEPPER=stepper_x CURRENT={RUN_CURRENT_X}
diff --git a/Firmware/fysetc-cheetah-v3.0.cfg b/Firmware/fysetc-cheetah-v3.0.cfg
index e636c7d9..d5841581 100644
--- a/Firmware/fysetc-cheetah-v3.0.cfg
+++ b/Firmware/fysetc-cheetah-v3.0.cfg
@@ -448,8 +448,8 @@ gcode:
     G91
     G1 X-10 F1200
     
-    # Wait just a second… (give StallGuard registers time to clear)
-    G4 P1000
+    # Wait for StallGuard registers to clear
+    M400
     G90
     # Set current during print
     SET_TMC_CURRENT STEPPER=stepper_x CURRENT={RUN_CURRENT_X}
@@ -470,8 +470,8 @@ gcode:
     G91
     G1 Y-10 F1200
 
-    # Wait just a second… (give StallGuard registers time to clear)
-    G4 P1000
+    # Wait for StallGuard registers to clear
+    M400
     G90
     # Set current during print
     SET_TMC_CURRENT STEPPER=stepper_x CURRENT={RUN_CURRENT_X}
diff --git a/Firmware/mellow-fly-gemini-v2.cfg b/Firmware/mellow-fly-gemini-v2.cfg
index e10b94aa..3f358b27 100644
--- a/Firmware/mellow-fly-gemini-v2.cfg
+++ b/Firmware/mellow-fly-gemini-v2.cfg
@@ -397,8 +397,8 @@ gcode:
     G91
     G1 X-10 F1200
     
-    # Wait just a second… (give StallGuard registers time to clear)
-    G4 P1000
+    # Wait for StallGuard registers to clear
+    M400
     G90
     # Set current during print
     SET_TMC_CURRENT STEPPER=stepper_x CURRENT={RUN_CURRENT_X}
@@ -419,8 +419,8 @@ gcode:
     G91
     G1 Y-10 F1200
 
-    # Wait just a second… (give StallGuard registers time to clear)
-    G4 P1000
+    # Wait for StallGuard registers to clear
+    M400
     G90
     # Set current during print
     SET_TMC_CURRENT STEPPER=stepper_x CURRENT={RUN_CURRENT_X}
diff --git a/Firmware/mellow-fly-gemini-v3.cfg b/Firmware/mellow-fly-gemini-v3.cfg
index 1190ee60..882cbe2f 100644
--- a/Firmware/mellow-fly-gemini-v3.cfg
+++ b/Firmware/mellow-fly-gemini-v3.cfg
@@ -397,8 +397,8 @@ gcode:
     G91
     G1 X-10 F1200
     
-    # Wait just a second… (give StallGuard registers time to clear)
-    G4 P1000
+    # Wait for StallGuard registers to clear
+    M400
     G90
     # Set current during print
     SET_TMC_CURRENT STEPPER=stepper_x CURRENT={RUN_CURRENT_X}
@@ -419,8 +419,8 @@ gcode:
     G91
     G1 Y-10 F1200
 
-    # Wait just a second… (give StallGuard registers time to clear)
-    G4 P1000
+    # Wait for StallGuard registers to clear
+    M400
     G90
     # Set current during print
     SET_TMC_CURRENT STEPPER=stepper_x CURRENT={RUN_CURRENT_X}