diff --git a/assets/ha/report_outdoor_temp_to_controller_from_weather.yaml b/assets/ha/report_outdoor_temp_to_controller_from_weather.yaml
index 0189e56..4b58c51 100644
--- a/assets/ha/report_outdoor_temp_to_controller_from_weather.yaml
+++ b/assets/ha/report_outdoor_temp_to_controller_from_weather.yaml
@@ -1,5 +1,5 @@
 # Script for reporting outdoor temperature to the controller from home assistant weather integration
-# Updated: 28.11.2023
+# Updated: 07.12.2023
 
 alias: Report outdoor temp to controller from weather
 description: ""
@@ -15,7 +15,7 @@ trigger:
     seconds: /30
 condition:
   - condition: template
-    value_template: "{{ has_value(source_entity) and has_value(target_entity) }}"
+    value_template: "{{ states(source_entity) != 'unavailable' and states(target_entity) != 'unavailable' }}"
 action:
   - if:
       - condition: template
diff --git a/assets/ha/report_temp_to_controller.yaml b/assets/ha/report_temp_to_controller.yaml
index 8416487..902d3a8 100644
--- a/assets/ha/report_temp_to_controller.yaml
+++ b/assets/ha/report_temp_to_controller.yaml
@@ -1,5 +1,5 @@
 # Script for reporting indoor/outdoor temperature to the controller from any home assistant sensor
-# Updated: 28.11.2023
+# Updated: 07.12.2023
 
 alias: Report temp to controller
 description: ""
@@ -16,7 +16,7 @@ trigger:
     seconds: /30
 condition:
   - condition: template
-    value_template: "{{ has_value(source_entity) and has_value(target_entity) }}"
+    value_template: "{{ states(source_entity) != 'unavailable' and states(target_entity) != 'unavailable' }}"
 action:
   - if:
       - condition: template