diff --git a/configuration/automations/calendar.yaml b/configuration/automations/calendar.yaml
index 70156f4..4fdac40 100644
--- a/configuration/automations/calendar.yaml
+++ b/configuration/automations/calendar.yaml
@@ -2,13 +2,15 @@
   alias: "[Calendar] Coffee machine"
   mode: single
   trigger:
-    - platform: calendar
-      event: start
-      entity_id: calendar.automations_caffeine_free_time
     - platform: calendar
       event: start
       entity_id: calendar.automations_sleep
+      offset: '-8:00:0'
   action:
+    - wait_for_trigger:
+        - platform: numeric_state
+          entity_id: sensor.coffee_machine_electrical_measurement
+          below: '4'
     - service: switch.turn_off
       target:
         entity_id: switch.coffee_machine_on_off
@@ -17,16 +19,10 @@
   alias: "[Calendar] Coffee machine"
   mode: single
   trigger:
-    - platform: calendar
-      event: end
-      entity_id: calendar.automations_caffeine_free_time
     - platform: calendar
       event: end
       entity_id: calendar.automations_sleep
   condition:
-    - condition: state
-      entity_id: calendar.automations_caffeine_free_time
-      state: 'off'
     - condition: state
       entity_id: calendar.automations_sleep
       state: 'off'
diff --git a/scripts/10.modes.yaml b/scripts/10.modes.yaml
index f6966a4..fcc284d 100644
--- a/scripts/10.modes.yaml
+++ b/scripts/10.modes.yaml
@@ -79,6 +79,9 @@ good_morning:
       entity_id: switch.computer_outlet
     - service: switch.turn_off
       entity_id: switch.mute_doorbell
+    - service: switch.turn_on
+      target:
+        entity_id: switch.coffee_machine_on_off
   mode: single
   icon: mdi:weather-sunny