diff --git a/custom_components/versatile_thermostat/base_thermostat.py b/custom_components/versatile_thermostat/base_thermostat.py
index 6e48783..13cb16a 100644
--- a/custom_components/versatile_thermostat/base_thermostat.py
+++ b/custom_components/versatile_thermostat/base_thermostat.py
@@ -1050,7 +1050,7 @@ def save_state():
             self._hvac_mode in [HVACMode.COOL, HVACMode.HEAT, HVACMode.HEAT_COOL]
             and self.preset_mode != PRESET_NONE
         ):
-            if self.preset_mode != PRESET_FROST_PROTECTION:
+            if self.preset_mode != PRESET_FROST_PROTECTION or self._hvac_mode in [HVACMode.HEAT, HVACMode.HEAT_COOL]:
                 await self.async_set_preset_mode_internal(self.preset_mode, True)
             else:
                 await self.async_set_preset_mode_internal(PRESET_ECO, True, False)