diff --git a/doc/home assistant/automation.yaml b/doc/home assistant/automation.yaml
index fcbdb28c8..4b7ee35f9 100644
--- a/doc/home assistant/automation.yaml	
+++ b/doc/home assistant/automation.yaml	
@@ -1,32 +1,42 @@
+- id: ems-esp_offline
+  alias: See if ems-esp goes offline
+  initial_state: true
+  trigger:
+    platform: state
+    entity_id: sensor.ems_esp_status
+    to: offline
+  action:
+    - service: notify.admin_notify
+      data_template:
+        title: EMS-ESP
+        message: 'gone offline'
+          
+- id: emsesp_restart
+  alias: See if ems-esp restarts
+  initial_state: true
+  trigger:
+    platform: mqtt
+    topic: home/ems-esp/start
+    payload: start
+  action:
+  - service: notify.admin_notify
+    data_template:
+      title: ems-esp has booted
+      message: EMS-ESP
+  - service: mqtt.publish
+    data_template:
+      topic: home/ems-esp/start
+      payload: '{{ now().strftime("%H:%M:%S %-d/%b/%Y") }}'
+
 - id: boiler_shower
   alias: Alert shower time
   initial_state: true
   trigger:
-    platform: mqtt
-    topic: home/ems-esp/shower_data
+    platform: state
+    entity_id: sensor.last_shower_duration
   action:
   - service: notify.admin_notify
     data_template:
       title: Shower finished at {{states.sensor.time.state}}
-      message: "{{ trigger.payload_json['duration'] }}"
-
-# when ems-esp starts send boottime
-- id: boiler_restart
-  alias: See if ems-esp restarts
-  trigger:
-    platform: mqtt
-    topic: home/ems-esp/start
-    payload: 'start'
-  action:
-    - service: notify.admin_notify
-      data_template:
-        title: "ems-esp has booted"
-        message: "EMS-ESP"
-    - service: mqtt.publish
-      data_template:
-        topic: 'home/ems-esp/start'
-        payload: >
-          {{ now().strftime("%H:%M:%S %-d/%b/%Y") }}
-
-
-
+      message: "{{ states.sensor.last_shower_duration.state }}"
+      
\ No newline at end of file
diff --git a/doc/home assistant/sensor.yaml b/doc/home assistant/sensor.yaml
index 28821fe97..f63171665 100644
--- a/doc/home assistant/sensor.yaml	
+++ b/doc/home assistant/sensor.yaml	
@@ -132,11 +132,11 @@
   value_template: '{{ value_json.pumpMod }}'
 
   # shower time duration
+
 - platform: mqtt
   name: 'Last shower duration'
   state_topic: "home/ems-esp/shower_data"
-  value_template: "{{ value_json.duration }}"
-  force_update: true
+  value_template: "{{ value_json.duration | is_defined }}"
 
 - platform: template
   sensors:
@@ -148,3 +148,9 @@
 
     boiler_boottime:
       value_template: '{{ as_timestamp(states.automation.see_if_boiler_restarts.attributes.last_triggered) | timestamp_custom("%H:%M:%S %d/%m/%y") }}'
+
+# general
+
+- platform: mqtt
+  state_topic: 'home/ems-esp/status'
+  name: 'ems-esp status'