diff --git a/Climate/bosch_bth-ra_control.yaml b/Climate/bosch_bth-ra_control.yaml
index 3a9eb71..2536d43 100644
--- a/Climate/bosch_bth-ra_control.yaml
+++ b/Climate/bosch_bth-ra_control.yaml
@@ -315,6 +315,12 @@ variables:
     {% else %}
       {{ none }}
     {% endif %}
+  remote_temperature_last_change: >
+    {% if remote_temperature_entity and remote_temperature_entity in states %}
+      {{ states[remote_temperature_entity].last_changed }}
+    {% else %}
+      {{ none }}
+    {% endif %}
   override_duration_exceeded: >
     {% if override_last_change and override_reset_duration_seconds > 0 and setpoint_change_source_entity and states(setpoint_change_source_entity) == 'manual' %}
       {% set elapsed = (now() - override_last_change).total_seconds() %}
@@ -494,10 +500,10 @@ actions:
                 {{ temperature_sensor is defined and states(temperature_sensor) | is_number }}
             - condition: template
               value_template: >
-                {{ remote_temperature_entity and remote_temperature_entity in states }}
+                {{ remote_temperature_last_change != none }}
             - condition: template
               value_template: >
-                {{ (now() - states[remote_temperature_entity].last_changed).total_seconds() > 1499 }}
+                {{ (now() - remote_temperature_last_change).total_seconds() > 1499 }}
             sequence:
               - service: number.set_value
                 data: