diff --git a/Firmware/mmu2.cpp b/Firmware/mmu2.cpp
index 55405637b2..76cb042d49 100644
--- a/Firmware/mmu2.cpp
+++ b/Firmware/mmu2.cpp
@@ -386,7 +386,7 @@ bool MMU2::tool_change(uint8_t slot) {
             !marlin_printingIsActive()) {
             // If Tcodes are used manually through the serial
             // we need to unload manually as well -- but only if FINDA detects filament
-            unload();
+            UnloadInner();
         }
 
         ReportingRAII rep(CommandInProgress::ToolChange);
@@ -482,10 +482,6 @@ void MMU2::UnloadInner() {
         IncrementMMUFails();
     }
     MakeSound(Confirm);
-
-    // no active tool
-    SetCurrentTool(MMU2_NO_TOOL);
-    tool_change_extruder = MMU2_NO_TOOL;
 }
 
 bool MMU2::unload() {
@@ -500,6 +496,10 @@ bool MMU2::unload() {
         UnloadInner();
     }
 
+    // no active tool
+    SetCurrentTool(MMU2_NO_TOOL);
+    tool_change_extruder = MMU2_NO_TOOL;
+
     ScreenUpdateEnable();
     return true;
 }