diff --git a/modules/programs/waybar.nix b/modules/programs/waybar.nix
index 5472a0ef463..bf63dcc7b42 100644
--- a/modules/programs/waybar.nix
+++ b/modules/programs/waybar.nix
@@ -378,6 +378,7 @@ in {
           ExecStart = "${cfg.package}/bin/waybar";
           Restart = "always";
           RestartSec = "1sec";
+          KillMode = "mixed";
         };
 
         Install = { WantedBy = [ "graphical-session.target" ]; };
diff --git a/tests/modules/programs/waybar/systemd-with-graphical-session-target.service b/tests/modules/programs/waybar/systemd-with-graphical-session-target.service
index 64c89f93d75..9bdcf78c42a 100644
--- a/tests/modules/programs/waybar/systemd-with-graphical-session-target.service
+++ b/tests/modules/programs/waybar/systemd-with-graphical-session-target.service
@@ -4,6 +4,7 @@ WantedBy=graphical-session.target
 [Service]
 BusName=fr.arouillard.waybar
 ExecStart=@waybar@/bin/waybar
+KillMode=mixed
 Restart=always
 RestartSec=1sec
 Type=dbus