diff --git a/bin/omarchy-toggle-nightlight b/bin/omarchy-toggle-nightlight
index bd2db5b8..2ab2deb6 100755
--- a/bin/omarchy-toggle-nightlight
+++ b/bin/omarchy-toggle-nightlight
@@ -2,7 +2,13 @@
 
 # Default temperature values
 ON_TEMP=4000
-OFF_TEMP=6500
+OFF_TEMP=6000
+
+# Ensure hyprsunset is running
+if ! pgrep -x hyprsunset; then
+  setsid uwsm app -- hyprsunset &
+  sleep 1 # Give it time to register
+fi
 
 # Query the current temperature
 CURRENT_TEMP=$(hyprctl hyprsunset temperature 2>/dev/null | grep -oE '[0-9]+')
diff --git a/default/hypr/autostart.conf b/default/hypr/autostart.conf
index 72e64af9..ae9b0845 100644
--- a/default/hypr/autostart.conf
+++ b/default/hypr/autostart.conf
@@ -2,7 +2,6 @@ exec-once = uwsm app -- hypridle
 exec-once = uwsm app -- mako
 exec-once = uwsm app -- waybar
 exec-once = uwsm app -- fcitx5
-exec-once = uwsm app -- hyprsunset
 exec-once = uwsm app -- swaybg -i ~/.config/omarchy/current/background -m fill
 exec-once = uwsm app -- swayosd-server
 exec-once = uwsm app -- walker --gapplication-service