diff --git a/Marlin/Marlin.h b/Marlin/Marlin.h
index 3cd60ac5e..9af546e68 100644
--- a/Marlin/Marlin.h
+++ b/Marlin/Marlin.h
@@ -440,7 +440,7 @@ void report_current_position();
   #endif
 #endif
 
-#if HAS_CONTROLLERFAN
+#if ENABLED(USE_CONTROLLER_FAN)
   extern int controllerFanSpeed;
 #endif
 
diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp
index bc00113ac..8b40524c9 100644
--- a/Marlin/Marlin_main.cpp
+++ b/Marlin/Marlin_main.cpp
@@ -487,7 +487,7 @@ float soft_endstop_min[XYZ] = { X_MIN_BED, Y_MIN_BED, Z_MIN_POS },
   #endif
 #endif
 
-#if HAS_CONTROLLERFAN
+#if ENABLED(USE_CONTROLLER_FAN)
   int controllerFanSpeed = 0;
 #endif
 
diff --git a/Marlin/power.cpp b/Marlin/power.cpp
index a2f231f69..188a3a03b 100644
--- a/Marlin/power.cpp
+++ b/Marlin/power.cpp
@@ -45,7 +45,7 @@ bool Power::is_power_needed() {
     HOTEND_LOOP() if (thermalManager.autofan_speed[e] > 0) return true;
   #endif
 
-  #if ENABLED(AUTO_POWER_CONTROLLERFAN) && HAS_CONTROLLER_FAN
+  #if ENABLED(AUTO_POWER_CONTROLLERFAN) && HAS_CONTROLLER_FAN && ENABLED(USE_CONTROLLER_FAN)
     if (controllerFanSpeed > 0) return true;
   #endif