diff --git a/Marlin/src/module/configuration_store.cpp b/Marlin/src/module/configuration_store.cpp
index 9a92e47d5..1ae61a5ad 100644
--- a/Marlin/src/module/configuration_store.cpp
+++ b/Marlin/src/module/configuration_store.cpp
@@ -877,6 +877,7 @@ void MarlinSettings::postprocess() {
     //
     // Linear Advance
     //
+
     _FIELD_TEST(planner_extruder_advance_K);
 
     #if ENABLED(LIN_ADVANCE)
@@ -888,6 +889,10 @@ void MarlinSettings::postprocess() {
 
     _FIELD_TEST(motor_current_setting);
 
+    //
+    // Motor Current PWM
+    //
+
     #if HAS_MOTOR_CURRENT_PWM
       for (uint8_t q = XYZ; q--;) EEPROM_WRITE(stepper.motor_current_setting[q]);
     #else
@@ -1408,6 +1413,8 @@ void MarlinSettings::postprocess() {
         for (uint8_t q=TMC_AXES; q--;) EEPROM_READ(val);
       #endif
 
+      _FIELD_TEST(tmc_hybrid_threshold);
+
       #if ENABLED(HYBRID_THRESHOLD)
         #define TMC_SET_PWMTHRS(A,Q) tmc_set_pwmthrs(stepper##Q, tmc_hybrid_threshold.Q, planner.axis_steps_per_mm[_AXIS(A)])
         tmc_hybrid_threshold_t tmc_hybrid_threshold;
@@ -1458,12 +1465,15 @@ void MarlinSettings::postprocess() {
         for (uint8_t q=TMC_AXES; q--;) EEPROM_READ(thrs_val);
       #endif
 
-      /*
+      /**
        * TMC StallGuard threshold.
        * X and X2 use the same value
        * Y and Y2 use the same value
        * Z, Z2 and Z3 use the same value
        */
+
+      _FIELD_TEST(tmc_sgt);
+
       tmc_sgt_t tmc_sgt;
       EEPROM_READ(tmc_sgt);
       #if USE_SENSORLESS
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 66f031817..823fa04a2 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -35,7 +35,7 @@
 #ifndef __PINS_H__
 #define __PINS_H__
 
-#include "../inc/MarlinConfig.h"
+#define MAX_EXTRUDERS 6
 
 #if MB(RAMPS_13_EFB) || MB(RAMPS_14_EFB) || MB(RAMPS_PLUS_EFB) || MB(RAMPS_14_RE_ARM_EFB) || MB(RAMPS_SMART_EFB) || MB(RAMPS_DUO_EFB) || MB(RAMPS4DUE_EFB)
   #define IS_RAMPS_EFB
@@ -658,10 +658,6 @@
   #define SUICIDE_PIN -1
 #endif
 
-#ifndef MAX_EXTRUDERS
-  #define MAX_EXTRUDERS 5
-#endif
-
 #ifndef NUM_SERVO_PLUGS
   #define NUM_SERVO_PLUGS 4
 #endif
diff --git a/Marlin/src/pins/pins_RADDS.h b/Marlin/src/pins/pins_RADDS.h
index be1689810..1825ee1e6 100644
--- a/Marlin/src/pins/pins_RADDS.h
+++ b/Marlin/src/pins/pins_RADDS.h
@@ -131,7 +131,6 @@
 
     #define RADDS_EXT_MSI_PIN 69
 
-    #define MAX_EXTRUDERS 6
     #define BOARD_INIT() OUT_WRITE(RADDS_EXT_VDD_PIN, HIGH)
 
   #else