diff --git a/klippy/extras/homing.py b/klippy/extras/homing.py
index 2dff044c664d..56b4cb84d713 100644
--- a/klippy/extras/homing.py
+++ b/klippy/extras/homing.py
@@ -281,7 +281,7 @@ def _set_current_post_homing(self, homing_axes):
             chs = rail.get_tmc_current_helpers()
             dwell_time = None
             for ch in chs:
-                if ch is not None and ch.needs_home_current_change():
+                if ch is not None and ch.needs_run_current_change():
                     if dwell_time is None:
                         dwell_time = ch.current_change_dwell_time
                     ch.set_current_for_normal(print_time)
diff --git a/klippy/extras/tmc2130.py b/klippy/extras/tmc2130.py
index 95df2ee85170..b34680b6f9b8 100644
--- a/klippy/extras/tmc2130.py
+++ b/klippy/extras/tmc2130.py
@@ -230,6 +230,9 @@ def __init__(self, config, mcu_tmc):
     def needs_home_current_change(self):
         return self._home_current != self.run_current
 
+    def needs_run_current_change(self):
+        return self._prev_current != self.run_current
+
     def set_home_current(self, new_home_current):
         self._home_current = min(MAX_CURRENT, new_home_current)
 
@@ -281,7 +284,7 @@ def get_current(self):
 
     def set_current(self, run_current, hold_current, print_time, force=False):
         if (
-            run_current == self._prev_current
+            run_current == self.run_current
             and hold_current == self.req_hold_current
             and not force
         ):
diff --git a/klippy/extras/tmc2240.py b/klippy/extras/tmc2240.py
index 23fc714082fa..2fe209844f6d 100644
--- a/klippy/extras/tmc2240.py
+++ b/klippy/extras/tmc2240.py
@@ -300,6 +300,9 @@ def __init__(self, config, mcu_tmc):
     def needs_home_current_change(self):
         return self._home_current != self.run_current
 
+    def needs_run_current_change(self):
+        return self._prev_current != self.run_current
+
     def set_home_current(self, new_home_current):
         self._home_current = min(self.max_cur, new_home_current)
 
@@ -360,7 +363,7 @@ def get_current(self):
 
     def set_current(self, run_current, hold_current, print_time, force=False):
         if (
-            run_current == self._prev_current
+            run_current == self.run_current
             and hold_current == self.req_hold_current
             and not force
         ):
diff --git a/klippy/extras/tmc2660.py b/klippy/extras/tmc2660.py
index fc334ea249cb..64021f8c2750 100644
--- a/klippy/extras/tmc2660.py
+++ b/klippy/extras/tmc2660.py
@@ -150,6 +150,9 @@ def __init__(self, config, mcu_tmc):
     def needs_home_current_change(self):
         return self._home_current != self.current
 
+    def needs_run_current_change(self):
+        return self._prev_current != self.current
+
     def set_home_current(self, new_home_current):
         self._home_current = min(MAX_CURRENT, new_home_current)
 
diff --git a/klippy/extras/tmc5160.py b/klippy/extras/tmc5160.py
index 54c081ad9d2c..b00b992bd2f1 100644
--- a/klippy/extras/tmc5160.py
+++ b/klippy/extras/tmc5160.py
@@ -283,6 +283,9 @@ def __init__(self, config, mcu_tmc):
     def needs_home_current_change(self):
         return self._home_current != self.run_current
 
+    def needs_run_current_change(self):
+        return self._prev_current != self.run_current
+
     def set_home_current(self, new_home_current):
         self._home_current = min(MAX_CURRENT, new_home_current)
 
@@ -338,7 +341,7 @@ def get_current(self):
 
     def set_current(self, run_current, hold_current, print_time, force=False):
         if (
-            run_current == self._prev_current
+            run_current == self.run_current
             and hold_current == self.req_hold_current
             and not force
         ):