diff --git a/script.service.hue/addon.xml b/script.service.hue/addon.xml
index b252c49f..cfd00fb6 100644
--- a/script.service.hue/addon.xml
+++ b/script.service.hue/addon.xml
@@ -1,4 +1,4 @@
-<addon id="script.service.hue" name="Hue Service" provider-name="zim514" version="1.5.6">
+<addon id="script.service.hue" name="Hue Service" provider-name="zim514" version="1.5.7">
     <requires>
         <import addon="xbmc.python" version="3.0.0"/>
         <import addon="script.module.requests" version="2.27.1"/>
@@ -20,7 +20,9 @@
         </assets>
         <source>https://github.com/zim514/script.service.hue</source>
         <forum>https://forum.kodi.tv/showthread.php?tid=344886</forum>
-        <news>
+        <news>v1.5.7
+- Fix morning / sunset timers
+
 v1.5.6
 - Translations updates from Weblate
 - Various bug fixes
diff --git a/script.service.hue/resources/lib/core.py b/script.service.hue/resources/lib/core.py
index c64b7fec..578384b2 100644
--- a/script.service.hue/resources/lib/core.py
+++ b/script.service.hue/resources/lib/core.py
@@ -239,7 +239,7 @@ def _run_sunset(self):
     def _set_daytime(self):
         now = datetime.now()
 
-        if self.morning_time <= now.time() <= self.bridge.sunset:
+        if self.morning_time <= now.time() < self.bridge.sunset:
             cache_set("daytime", True)
         else:
             cache_set("daytime", False)
@@ -249,26 +249,25 @@ def _task_loop(self):
         while not self.monitor.abortRequested() and not self.stop_timers.is_set():
 
             now = datetime.now()
-            self.morning_time = convert_time(ADDON.getSettingString("morningTime")) # Update morning time in case it has changed
+            self.morning_time = convert_time(ADDON.getSettingString("morningTime"))  # Update morning time in case it has changed
 
             time_to_sunset = self._time_until(now, self.bridge.sunset)
             time_to_morning = self._time_until(now, self.morning_time)
 
-            if time_to_sunset < time_to_morning:
-                # Sunset is next
-                wait_time = time_to_sunset
-                xbmc.log(f"[script.service.hue] Timers: Sunset is next. wait_time: {wait_time}")
-                if self.monitor.waitForAbort(wait_time):
-                    break
-                self._run_sunset()
+            if time_to_sunset <= 0 or time_to_sunset > time_to_morning:
 
-            else:
                 # Morning is next
-                wait_time = time_to_morning
-                xbmc.log(f"[script.service.hue] Timers: Morning is next. wait_time: {wait_time}")
-                if self.monitor.waitForAbort(wait_time):
+                xbmc.log(f"[script.service.hue] Timers: Morning is next. wait_time: {time_to_morning}")
+                if self.monitor.waitForAbort(time_to_morning):
                     break
                 self._run_morning()
+
+            else:
+                # Sunset is next
+                xbmc.log(f"[script.service.hue] Timers: Sunset is next. wait_time: {time_to_sunset}")
+                if self.monitor.waitForAbort(time_to_sunset):
+                    break
+                self._run_sunset()
         xbmc.log("[script.service.hue] Timers stopped")
 
     @staticmethod