diff --git a/userspace/files/comma.service b/userspace/files/comma.service
index 10ef18d6..176570ea 100644
--- a/userspace/files/comma.service
+++ b/userspace/files/comma.service
@@ -5,7 +5,9 @@ Type=simple
 User=comma
 Restart=always
 ExecStart=/bin/bash -c "/usr/bin/tmux new-session -s comma -d /usr/comma/comma.sh && sleep infinity"
-KillSignal=SIGKILL
+TimeoutStopSec=1
+KillSignal=SIGTERM
+RestartKillSignal=SIGKILL
 LimitRTPRIO=100
 LimitNICE=-10