diff --git a/packages/climate/climate.yaml b/packages/climate/climate.yaml
index 4f2dd54..d6dbef7 100644
--- a/packages/climate/climate.yaml
+++ b/packages/climate/climate.yaml
@@ -37,7 +37,8 @@ automation:
         data:
           scene_id: hvac_restore_state
           snapshot_entities:
-            - climate.thermostat
+            # See https://github.com/home-assistant/core/issues/69925
+            # - climate.thermostat
             - input_select.climate_mode
       - service: climate.set_hvac_mode
         target:
@@ -73,6 +74,13 @@ automation:
       - service: scene.turn_on
         target:
           entity_id: scene.hvac_restore_state
+      # See https://github.com/home-assistant/core/issues/69925
+      # Assume thermostat is always heat_cool when active
+      - service: climate.set_hvac_mode
+        target:
+          entity_id: climate.thermostat
+        data:
+          hvac_mode: "{{ 'off' if is_state('input_select.climate_mode', 'Off') else 'heat_cool' }}"
       - service: notify.telegram_home
         data:
           message: HVAC Restored (Window or Door Open)