diff --git a/Climate/bosch_bth-ra_control.yaml b/Climate/bosch_bth-ra_control.yaml
index 79b1d34..74e2454 100644
--- a/Climate/bosch_bth-ra_control.yaml
+++ b/Climate/bosch_bth-ra_control.yaml
@@ -227,13 +227,13 @@ variables:
   is_sensor_sync_needed: >
     {% set current_remote_temp = states(remote_temperature_entity) | float(0) %}
     {% set new_sensor_temp = states(temperature_sensor) | float(0) %}
-    {% set target = safe_temperature | float(0) %}
+    {% set target_temp = state_attr(trv, 'temperature') | float(0) %}
     {% set diff = (new_sensor_temp - current_remote_temp) | abs %}
     {% if diff >= 0.5 %}
       true
-    {% elif new_sensor_temp < target and current_remote_temp >= target %}
+    {% elif new_sensor_temp < target_temp and current_remote_temp >= target_temp %}
       true
-    {% elif new_sensor_temp > target and current_remote_temp <= target %}
+    {% elif new_sensor_temp > target_temp and current_remote_temp <= target_temp %}
       true
     {% else %}
       false