diff --git a/config/automation/System/CucKoo_Clock.yaml b/config/automation/System/CucKoo_Clock.yaml
index 86162aac..85bb1bb0 100755
--- a/config/automation/System/CucKoo_Clock.yaml
+++ b/config/automation/System/CucKoo_Clock.yaml
@@ -15,9 +15,6 @@
       minutes: 30
 
   condition:
-    - condition: time
-      after: '09:29:00'
-      before: '21:30:00'
     - condition: or  #Either we are home or Guest_Mode is on.
       conditions:
         - condition: state
diff --git a/config/automation/Timed_Triggers/2200.yaml b/config/automation/Timed_Triggers/2200.yaml
index 846d7bb4..c82005e4 100755
--- a/config/automation/Timed_Triggers/2200.yaml
+++ b/config/automation/Timed_Triggers/2200.yaml
@@ -12,6 +12,8 @@
       at: '22:00:00'
 
   action:
+    - wait_template: >-
+       {{ not is_state('input_boolean.guest_mode', 'on') or is_state('group.bed', 'on') }}
     - wait_template: >-
        {{ not is_state('media_player.livingroomCC', 'playing') }}
     - wait_template: >-