diff --git a/packaging/linux/sunshine.service.in b/packaging/linux/sunshine.service.in
index 1ba3a138b46..946d90242b5 100644
--- a/packaging/linux/sunshine.service.in
+++ b/packaging/linux/sunshine.service.in
@@ -2,6 +2,7 @@
 Description=@PROJECT_DESCRIPTION@
 StartLimitIntervalSec=500
 StartLimitBurst=5
+After=graphical-session.target
 
 [Service]
 # Avoid starting Sunshine before the desktop is fully initialized.
@@ -12,4 +13,4 @@ Restart=on-failure
 RestartSec=5s
 
 [Install]
-WantedBy=xdg-desktop-autostart.target
+WantedBy=graphical-session.target