diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index bec7f502424f..fc3b26d8a061 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -591,6 +591,8 @@
   // Use TEMP_SENSOR_SOC as a trigger for enabling the controller fan
   //#define CONTROLLER_FAN_MIN_SOC_TEMP 40  // (°C) Turn on the fan if the SoC reaches this temperature
 
+  #define CONTROLLER_FAN_BED_HEATING        // Turn on the fan when heating the bed
+
   //#define CONTROLLER_FAN_EDITABLE         // Enable M710 configurable settings
   #if ENABLED(CONTROLLER_FAN_EDITABLE)
     #define CONTROLLER_FAN_MENU             // Enable the Controller Fan submenu
diff --git a/Marlin/src/feature/controllerfan.cpp b/Marlin/src/feature/controllerfan.cpp
index acbae459e716..323d988a2d9e 100644
--- a/Marlin/src/feature/controllerfan.cpp
+++ b/Marlin/src/feature/controllerfan.cpp
@@ -70,7 +70,9 @@ void ControllerFan::update() {
      */
     const ena_mask_t axis_mask = TERN(CONTROLLER_FAN_USE_Z_ONLY, _BV(Z_AXIS), (ena_mask_t)~TERN0(CONTROLLER_FAN_IGNORE_Z, _BV(Z_AXIS)));
     if ( (stepper.axis_enabled.bits & axis_mask)
-      || TERN0(HAS_HEATED_BED, thermalManager.temp_bed.soft_pwm_amount > 0)
+      #if ALL(HAS_HEATED_BED, CONTROLLER_FAN_BED_HEATING)
+        || thermalManager.temp_bed.soft_pwm_amount > 0
+      #endif
       #ifdef CONTROLLER_FAN_MIN_BOARD_TEMP
         || thermalManager.wholeDegBoard() >= CONTROLLER_FAN_MIN_BOARD_TEMP
       #endif
diff --git a/Marlin/src/inc/Conditionals-4-adv.h b/Marlin/src/inc/Conditionals-4-adv.h
index 1401dab57031..291c140bfc07 100644
--- a/Marlin/src/inc/Conditionals-4-adv.h
+++ b/Marlin/src/inc/Conditionals-4-adv.h
@@ -838,6 +838,7 @@
 #if !TEMP_SENSOR_BED
   #undef BED_MINTEMP
   #undef BED_MAXTEMP
+  #undef CONTROLLER_FAN_BED_HEATING
 #endif
 #if DISABLED(THERMAL_PROTECTION_BED)
   #undef THERMAL_PROTECTION_BED_PERIOD