diff --git a/klippy/extras/tmc.py b/klippy/extras/tmc.py
index fa2c0b57..7ef2fc93 100644
--- a/klippy/extras/tmc.py
+++ b/klippy/extras/tmc.py
@@ -153,20 +153,21 @@ class TMCCommandHelper:
                                      minval=0., maxval=max_current)
         hold_current = gcmd.get_float('HOLDCURRENT', None,
                                       above=0., maxval=max_current)
-        if run_current is None and hold_current is None:
-            # Query only
-            if prev_hold_current is None:
-                gcmd.respond_info("Run Current: %0.2fA" % (prev_run_current,))
-            else:
-                gcmd.respond_info("Run Current: %0.2fA Hold Current: %0.2fA"
-                                  % (prev_run_current, prev_hold_current))
-            return
-        if run_current is None:
-            run_current = prev_run_current
-        if hold_current is None:
-            hold_current = prev_hold_current
-        print_time = self.printer.lookup_object('toolhead').get_last_move_time()
-        ch.set_current(run_current, hold_current, print_time)
+        if run_current is not None or hold_current is not None:
+            if run_current is None:
+                run_current = prev_run_current
+            if hold_current is None:
+                hold_current = prev_hold_current
+            toolhead = self.printer.lookup_object('toolhead')
+            print_time = toolhead.get_last_move_time()
+            ch.set_current(run_current, hold_current, print_time)
+            prev_run_current, prev_hold_current, max_current = ch.get_current()
+        # Report values
+        if prev_hold_current is None:
+            gcmd.respond_info("Run Current: %0.2fA" % (prev_run_current,))
+        else:
+            gcmd.respond_info("Run Current: %0.2fA Hold Current: %0.2fA"
+                              % (prev_run_current, prev_hold_current))
     # Stepper enable/disable via comms
     def _do_enable(self, print_time, is_enable):
         toff_val = 0