diff --git a/Climate/bosch_bth-ra_control.yaml b/Climate/bosch_bth-ra_control.yaml
index b0d72c3..84fe7ec 100644
--- a/Climate/bosch_bth-ra_control.yaml
+++ b/Climate/bosch_bth-ra_control.yaml
@@ -327,8 +327,9 @@ variables:
       {{ none }}
     {% endif %}
   override_duration_exceeded: >
-    {% if override_last_change != none 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() %}
+    {% set last_change = override_last_change %}
+    {% if last_change != none and last_change is not string and override_reset_duration_seconds > 0 and setpoint_change_source_entity and states(setpoint_change_source_entity) == 'manual' %}
+      {% set elapsed = (now() - last_change).total_seconds() %}
       {{ elapsed > override_reset_duration_seconds }}
     {% else %}
       false
@@ -505,7 +506,7 @@ actions:
                 {{ temperature_sensor is defined and states(temperature_sensor) | is_number }}
             - condition: template
               value_template: >
-                {{ remote_temperature_last_change != none }}
+                {{ remote_temperature_last_change != none and remote_temperature_last_change is not string }}
             - condition: template
               value_template: >
                 {{ (now() - remote_temperature_last_change).total_seconds() > 1499 }}