diff --git a/sunshine.service.in b/sunshine.service.in
index 802442df..c0c38289 100644
--- a/sunshine.service.in
+++ b/sunshine.service.in
@@ -2,12 +2,7 @@
 Description=Sunshine Gamestream Server for Moonlight
 
 [Service]
-WorkingDirectory=/home/%u
-Environment="DISPLAY=:0"
-Type=simple
-# wait for Xorg
-ExecStartPre=/bin/sh -c 'while ! pgrep Xorg; do sleep 2; done'
 ExecStart=@SUNSHINE_EXECUTABLE_PATH@
 
 [Install]
-WantedBy=default.target
+WantedBy=graphical-session.target