diff --git a/Climate/bosch_bth-ra_control.yaml b/Climate/bosch_bth-ra_control.yaml
index 05051f6..516082c 100644
--- a/Climate/bosch_bth-ra_control.yaml
+++ b/Climate/bosch_bth-ra_control.yaml
@@ -225,7 +225,7 @@ variables:
       false
     {% endif %}
   is_sensor_sync_needed: >
-    {% set current_remote = states('number.heizthermostat_pierre_buro_remote_temperature') | float(0) %}
+    {% set current_remote = states('remote_temperature_entity') | float(0) %}
     {% set new_sensor = states(temperature_sensor) | float(0) %}
     {% set target = safe_temperature | float(0) %}
     {% set diff = (new_sensor - current_remote) | abs %}
@@ -423,7 +423,7 @@ actions:
                 {{ temperature_sensor is defined and states(temperature_sensor) | is_number }}
             - condition: template
               value_template: >
-                {{ (now() - states[temperature_sensor].last_changed).total_seconds() > 1499 }}
+                {{ (now() - states[remote_temperature_entity].last_changed).total_seconds() > 1499 }}
             sequence:
               - service: number.set_value
                 data: