diff --git a/.devcontainer/configuration.yaml b/.devcontainer/configuration.yaml
index bc56181..8e0d22e 100644
--- a/.devcontainer/configuration.yaml
+++ b/.devcontainer/configuration.yaml
@@ -51,8 +51,14 @@ input_boolean:
     name: Window 1
     icon: mdi:window-closed-variant
   # input_boolean to simulate the heater entity switch. Only for development environment.
+  fake_heater_switch3:
+    name: Heater 3
+    icon: mdi:radiator
+  fake_heater_switch2:
+    name: Heater 2
+    icon: mdi:radiator
   fake_heater_switch1:
-    name: Heater 1 (Linear)
+    name: Heater 1
     icon: mdi:radiator
   fake_heater_4switch1:
     name: Heater (multiswitch1)
diff --git a/custom_components/versatile_thermostat/climate.py b/custom_components/versatile_thermostat/climate.py
index 77c7545..afd2c98 100644
--- a/custom_components/versatile_thermostat/climate.py
+++ b/custom_components/versatile_thermostat/climate.py
@@ -1203,7 +1203,6 @@ class VersatileThermostat(ClimateEntity, RestoreEntity):
             await under.set_hvac_mode(hvac_mode)
 
         self._hvac_mode = hvac_mode
-        await self._async_control_heating(force=True)
 
         # Ensure we update the current operation after changing the mode
         self.reset_last_temperature_time()
diff --git a/custom_components/versatile_thermostat/underlyings.py b/custom_components/versatile_thermostat/underlyings.py
index 08eebe9..2b22f68 100644
--- a/custom_components/versatile_thermostat/underlyings.py
+++ b/custom_components/versatile_thermostat/underlyings.py
@@ -178,6 +178,7 @@ class UnderlyingSwitch(UnderlyingEntity):
         if hvac_mode == HVACMode.OFF:
             if self.is_device_active:
                 await self.turn_off()
+            await self._thermostat._async_control_heating(force=True)
         return
 
     @property