diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp
index 0d998da79..4036843c6 100644
--- a/Firmware/Marlin_main.cpp
+++ b/Firmware/Marlin_main.cpp
@@ -8374,6 +8374,7 @@ Sigma_Exit:
     }
     break;
 
+#ifdef TMC2130
 #ifdef TMC2130_SERVICE_CODES_M910_M918
 
     /*!
@@ -8434,6 +8435,7 @@ Sigma_Exit:
         }
     }
     break;
+#endif // TMC2130_SERVICE_CODES_M910_M918
 
     /*!
 	### M913 - Print TMC2130 currents <a href="https://reprap.org/wiki/G-code#M913:_Print_TMC2130_currents">M913: Print TMC2130 currents</a>
@@ -8446,7 +8448,6 @@ Sigma_Exit:
     }
     break;
 
-#endif // TMC2130_SERVICE_CODES_M910_M918
    /*!
 	### M914 - Set TMC2130 normal mode <a href="https://reprap.org/wiki/G-code#M914:_Set_TMC2130_normal_mode">M914: Set TMC2130 normal mode</a>
   Updates EEPROM only if "P" is given, otherwise temporary (lasts until reset or motor idle timeout)
@@ -8473,7 +8474,6 @@ Sigma_Exit:
     - `R` - Revert to EEPROM value
     - `Q` - Print effective silent/normal status. (Does not report override)
     */
-#ifdef TMC2130
     case 914:
     case 915:
     {
@@ -8512,7 +8512,6 @@ Sigma_Exit:
     }
     break;
 
-#endif // TMC2130
 #ifdef TMC2130_SERVICE_CODES_M910_M918
     /*!
     ### M916 - Set TMC2130 Stallguard sensitivity threshold <a href="https://reprap.org/wiki/G-code#M916:_Set_TMC2130_Stallguard_sensitivity_threshold">M916: Set TMC2130 Stallguard sensitivity threshold</a>
@@ -8585,6 +8584,7 @@ Sigma_Exit:
     break;
 
 #endif //TMC2130_SERVICE_CODES_M910_M918
+#endif // TMC2130
 
     /*!
 	### M350 - Set microstepping mode <a href="https://reprap.org/wiki/G-code#M350:_Set_microstepping_mode">M350: Set microstepping mode</a>
diff --git a/Firmware/tmc2130.cpp b/Firmware/tmc2130.cpp
index 30f4724bc..05340622d 100755
--- a/Firmware/tmc2130.cpp
+++ b/Firmware/tmc2130.cpp
@@ -580,10 +580,10 @@ void tmc2130_setup_chopper(uint8_t axis, uint8_t mres, const MotorCurrents *curr
 void tmc2130_print_currents()
 {
 	printf_P(_n("tmc2130_print_currents()\n\tH\tR\nX\t%d\t%d\nY\t%d\t%d\nZ\t%d\t%d\nE\t%d\t%d\n"),
-		currents[0].getiHold(), currents[0].getiRun(),
-		currents[1].getiHold(), currents[1].getiRun(),
-		currents[2].getiHold(), currents[2].getiRun(),
-		currents[3].getiHold(), currents[3].getiRun()
+		currents[0].getOriginaliHold(), currents[0].getOriginaliRun(),
+		currents[1].getOriginaliHold(), currents[1].getOriginaliRun(),
+		currents[2].getOriginaliHold(), currents[2].getOriginaliRun(),
+		currents[3].getOriginaliHold(), currents[3].getOriginaliRun()
 	);
 }
 
diff --git a/Firmware/tmc2130.h b/Firmware/tmc2130.h
index 6cf48f04e..6c1308113 100644
--- a/Firmware/tmc2130.h
+++ b/Firmware/tmc2130.h
@@ -105,6 +105,8 @@ struct MotorCurrents {
 
     inline uint8_t getiRun() const { return iRun; }
     inline uint8_t getiHold() const { return min(iHold, iRun); }
+    inline uint8_t getOriginaliRun() const { return vSense ? iRun : iRun << 1; }
+    inline uint8_t getOriginaliHold() const { return min(vSense ? iHold : iHold << 1, getOriginaliRun()); }
     inline bool iHoldIsClamped() const { return iHold > iRun; }
     inline uint8_t getvSense() const { return vSense; }