From d452e957c9417a097094f0a8862191776efa9765 Mon Sep 17 00:00:00 2001
From: G Johansson <goran.johansson@shiftit.se>
Date: Wed, 11 Dec 2024 19:33:25 +0000
Subject: [PATCH] Last fix

---
 homeassistant/components/template/trigger_entity.py | 1 +
 homeassistant/helpers/trigger_template_entity.py    | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/homeassistant/components/template/trigger_entity.py b/homeassistant/components/template/trigger_entity.py
index 5130f332d5b..27362f8243d 100644
--- a/homeassistant/components/template/trigger_entity.py
+++ b/homeassistant/components/template/trigger_entity.py
@@ -48,6 +48,7 @@ class TriggerEntity(  # pylint: disable=hass-enforce-class-module
             **(run_variables or {}),
         }
 
+        self._render_availability_template(variables)
         self._render_templates(variables)
 
         self.async_set_context(self.coordinator.data["context"])
diff --git a/homeassistant/helpers/trigger_template_entity.py b/homeassistant/helpers/trigger_template_entity.py
index ce1ec394a43..111a1dc7e4b 100644
--- a/homeassistant/helpers/trigger_template_entity.py
+++ b/homeassistant/helpers/trigger_template_entity.py
@@ -222,12 +222,14 @@ class TriggerBaseEntity(Entity):
                     self._config[CONF_ATTRIBUTES],
                     variables,
                 )
-
-            self._rendered = rendered
         except TemplateError as err:
             logging.getLogger(f"{__package__}.{self.entity_id.split('.')[0]}").error(
                 "Error rendering %s template for %s: %s", key, self.entity_id, err
             )
+            # Availability property specifically checks if self._rendered is not self._static_rendered
+            self._rendered = self._static_rendered
+            return
+        self._rendered = rendered
 
 
 class ManualTriggerEntity(TriggerBaseEntity):