diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 1c641b1885..c4ad0aba07 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -260,7 +260,7 @@
   #define SWITCHING_NOZZLE_SERVO_ANGLES { 0, 90 }   // A pair of angles for { E0, E1 }.
                                                     // For Dual Servo use two pairs: { { lower, raise }, { lower, raise } }
   #define SWITCHING_NOZZLE_SERVO_DWELL 2500         // Dwell time to wait for servo to make physical move
-  #define SWITCHING_NOZZLE_PARK_TO_PROBE            // Retract active tool head while probing to avoid nozzle interference
+  //#define SWITCHING_NOZZLE_PARK_TO_PROBE          // Retract active toolhead while probing to avoid nozzle interference
 #endif
 
 // Switch nozzles by bumping the toolhead. Requires EVENT_GCODE_TOOLCHANGE_#.
diff --git a/Marlin/src/inc/Conditionals-1-axes.h b/Marlin/src/inc/Conditionals-1-axes.h
index e55f69c797..8e84d7d4d4 100644
--- a/Marlin/src/inc/Conditionals-1-axes.h
+++ b/Marlin/src/inc/Conditionals-1-axes.h
@@ -87,7 +87,7 @@
 #endif
 
 /**
- *  Multi-Material-Unit supported models
+ * Multi-Material-Unit supported models
  */
 #ifdef MMU_MODEL
   #define HAS_MMU 1
diff --git a/Marlin/src/inc/Conditionals-3-etc.h b/Marlin/src/inc/Conditionals-3-etc.h
index 2456728554..b361a50a58 100644
--- a/Marlin/src/inc/Conditionals-3-etc.h
+++ b/Marlin/src/inc/Conditionals-3-etc.h
@@ -69,6 +69,10 @@
 #endif
 #undef UNUSED_TEMP_SENSOR
 
+#if !HAS_HOTEND
+  #undef PREHEAT_1_TEMP_HOTEND
+  #undef PREHEAT_2_TEMP_HOTEND
+#endif
 #if !TEMP_SENSOR_BED
   #undef TEMP_SENSOR_BED
   #undef THERMAL_PROTECTION_BED
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index e05a7e5c1d..6064aa7828 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -737,7 +737,7 @@ static_assert(COUNT(arm) == LOGICAL_AXES, "AXIS_RELATIVE_MODES must contain " _L
   #elif !defined(SWITCHING_NOZZLE_SERVO_NR)
     #error "SWITCHING_NOZZLE requires SWITCHING_NOZZLE_SERVO_NR."
   #elif ALL(SWITCHING_NOZZLE_PARK_TO_PROBE, NOZZLE_AS_PROBE)
-    #error " SWITCHING_NOZZLE_PARK_TO_PROBE cannot be used with NOZZLE_AS_PROBE,"
+    #error "SWITCHING_NOZZLE_PARK_TO_PROBE cannot be used with NOZZLE_AS_PROBE."
   #elif SWITCHING_NOZZLE_SERVO_NR == 0 && !PIN_EXISTS(SERVO0)
     #error "SERVO0_PIN must be defined for your SWITCHING_NOZZLE."
   #elif SWITCHING_NOZZLE_SERVO_NR == 1 && !PIN_EXISTS(SERVO1)
diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp
index d6cd9ca7b8..58f2f2bcc5 100644
--- a/Marlin/src/module/probe.cpp
+++ b/Marlin/src/module/probe.cpp
@@ -406,7 +406,7 @@ FORCE_INLINE void probe_specific_action(const bool deploy) {
 
   #endif // PAUSE_BEFORE_DEPLOY_STOW
 
-  #if ENABLED(SWITCHING_NOZZLE, SWITCHING_NOZZLE_PARK_TO_PROBE) && DISABLED(NOZZLE_AS_PROBE)
+  #if ENABLED(SWITCHING_NOZZLE_PARK_TO_PROBE)
     servo[SWITCHING_NOZZLE_SERVO_NR].move(servo_angles[SWITCHING_NOZZLE_SERVO_NR][deploy ? 1 : 0]);
   #endif