diff --git a/system_files/desktop/shared/usr/share/ublue-os/just/80-bazzite.just b/system_files/desktop/shared/usr/share/ublue-os/just/80-bazzite.just
index 4caf345d..03f959c5 100644
--- a/system_files/desktop/shared/usr/share/ublue-os/just/80-bazzite.just
+++ b/system_files/desktop/shared/usr/share/ublue-os/just/80-bazzite.just
@@ -88,8 +88,12 @@ setup-sunshine ACTION="":
       ublue-update --wait
       rpm-ostree remove -y sunshine
       echo "Sunshine has been uninstalled."
-    elif [[ "${OPTION,,}" =~ ^autostart ]]; then
-      systemctl enable --user --now sunshine.service
+    elif [[ "${OPTION,,}" =~ autostart ]]; then
+      if [[ "${SERVICE_STATE,,}" =~ disabled ]]; then
+        systemctl enable --user --now sunshine.service
+      else
+        systemctl disable --user --now sunshine.service 
+      fi
     fi
 
 # Install LACT for overclocking & undervolting AMD GPUs