diff --git a/Marlin/src/pins/sensitive_pins.h b/Marlin/src/pins/sensitive_pins.h
index f56a00b82..12cadcbd9 100644
--- a/Marlin/src/pins/sensitive_pins.h
+++ b/Marlin/src/pins/sensitive_pins.h
@@ -456,12 +456,6 @@
   #endif // HOTENDS > 1
 #endif // HOTENDS
 
-#define _BED_PINS
-#if PIN_EXISTS(HEATER_BED) && PIN_EXISTS(TEMP_BED)
-  #undef _BED_PINS
-  #define _BED_PINS HEATER_BED_PIN, analogInputToDigitalPin(TEMP_BED_PIN),
-#endif
-
 //
 // Dual X, Dual Y, Multi-Z
 // Chip Select and Digital Micro-stepping
@@ -666,14 +660,31 @@
   #define _FANC
 #endif
 
+#if PIN_EXISTS(HEATER_BED) && PIN_EXISTS(TEMP_BED)
+  #define _BED_PINS HEATER_BED_PIN, analogInputToDigitalPin(TEMP_BED_PIN),
+#else
+  #define _BED_PINS
+#endif
+
+#if PIN_EXISTS(TEMP_CHAMBER)
+  #define __CHAMBER_PINS CHAMBER_AUTO_FAN_PIN, analogInputToDigitalPin(TEMP_CHAMBER_PIN),
+#else
+  #define __CHAMBER_PINS
+#endif
+#if PIN_EXISTS(HEATER_CHAMBER)
+  #define _CHAMBER_PINS __CHAMBER_PINS HEATER_CHAMBER_PIN,
+#else
+  #define _CHAMBER_PINS
+#endif
+
 #ifndef HAL_SENSITIVE_PINS
   #define HAL_SENSITIVE_PINS
 #endif
 
 #define SENSITIVE_PINS { \
   _X_PINS _Y_PINS _Z_PINS _X2_PINS _Y2_PINS _Z2_PINS _Z3_PINS _Z4_PINS _Z_PROBE \
-  _E0_PINS _E1_PINS _E2_PINS _E3_PINS _E4_PINS _E5_PINS _E6_PINS _E7_PINS _BED_PINS \
+  _E0_PINS _E1_PINS _E2_PINS _E3_PINS _E4_PINS _E5_PINS _E6_PINS _E7_PINS \
   _H0_PINS _H1_PINS _H2_PINS _H3_PINS _H4_PINS _H5_PINS _H6_PINS _H7_PINS \
   _PS_ON _HEATER_BED _FAN0 _FAN1 _FAN2 _FAN3 _FAN4 _FAN5 _FAN6 _FAN7 _FANC \
-  HAL_SENSITIVE_PINS \
+  _BED_PINS _CHAMBER_PINS HAL_SENSITIVE_PINS \
 }