diff --git a/nix/configuration/roles/sway/graphical_session_target.nix b/nix/configuration/roles/sway/graphical_session_target.nix
index b80c631..c5aa7f5 100644
--- a/nix/configuration/roles/sway/graphical_session_target.nix
+++ b/nix/configuration/roles/sway/graphical_session_target.nix
@@ -11,6 +11,7 @@ let
     text = ''
       # Trigger graphical-session.target through sway-session.target so systemd user units can depend on it.
       exec systemctl --user start sway-session.target
+      exec swaymsg -t subscribe '["shutdown"]' && systemctl --user stop sway-session.target
     '';
   };
 in