diff --git a/packages/sunrise.yaml b/packages/sunrise.yaml
index b8fa6f9..e94b2f9 100644
--- a/packages/sunrise.yaml
+++ b/packages/sunrise.yaml
@@ -69,10 +69,14 @@ input_select:
       - Weekdays
     icon: mdi:weather-sunset
 input_datetime:
-  sunrise_time:
+  sunrise_latest_time:
     name: Latest start time
     has_date: false
     has_time: true
+  sunrise_earliest_time:
+    name: Earliest start time
+    has_date: false
+    has_time: true
 sensor:
   - platform: time_date
     display_options:
@@ -89,7 +93,14 @@ automation:
       - platform: template
         value_template: >-
           {{ states('sensor.time') == (
-               states.input_datetime.sunrise_time.attributes.timestamp
+               states.input_datetime.sunrise_earliest_time.attributes.timestamp
+               | int | timestamp_custom('%H:%M', False)
+             )
+          }}
+      - platform: template
+        value_template: >-
+          {{ states('sensor.time') == (
+               states.input_datetime.sunrise_latest_time.attributes.timestamp
                | int | timestamp_custom('%H:%M', False)
              )
           }}
@@ -100,6 +111,13 @@ automation:
       - condition: state
         entity_id: group.bedroom_lights
         state: 'off'
+      - condition: and
+        conditions:
+          - condition: time
+            after: input_datetime.sunrise_earliest_time
+          - condition: sun
+            after: sunrise
+            after_offset: '-00:30:00'
       - condition: or
         conditions:
           - condition: state
@@ -133,7 +151,8 @@ group:
     name: Options
     entities:
       - input_select.sunrise_days
-      - input_datetime.sunrise_time
+      - input_datetime.sunrise_earliest_time
+      - input_datetime.sunrise_latest_time
   sunrise_scripts:
     name: Scripts
     entities: