diff --git a/src/logic/command_base.cpp b/src/logic/command_base.cpp
index bbed5f0..5fe0236 100644
--- a/src/logic/command_base.cpp
+++ b/src/logic/command_base.cpp
@@ -183,6 +183,11 @@ void CommandBase::HoldIdlerSelector() {
     mi::idler.HoldOn();
     mm::motion.AbortPlannedMoves(mm::Selector);
     ms::selector.HoldOn();
+
+    // Force turn off motors - prevent overheating and allow servicing during and error state.
+    // And don't worry about TMC2130 creep after axis enabled - we'll rehome both axes later when needed.
+    mm::motion.Disable(mm::Idler);
+    mm::motion.Disable(mm::Selector);
 }
 
 void CommandBase::ResumeIdlerSelector() {