diff --git a/hosts/common/systemd.nix b/hosts/common/systemd.nix
index d4ce603f..35d661df 100644
--- a/hosts/common/systemd.nix
+++ b/hosts/common/systemd.nix
@@ -2,7 +2,11 @@
 {
   systemd.extraConfig = ''
     # DefaultTimeoutStopSec defaults to 90s, and frequently blocks overall system shutdown.
-    # note that the values for the system manager and the user service manager must be set separately.
+    DefaultTimeoutStopSec=25
+  '';
+
+  systemd.user.extraConfig = ''
+    # DefaultTimeoutStopSec defaults to 90s, and frequently blocks overall system shutdown.
     DefaultTimeoutStopSec=25
   '';