diff --git a/modules/users/s6-rc.nix b/modules/users/s6-rc.nix
index 7bd93482..efc36c07 100644
--- a/modules/users/s6-rc.nix
+++ b/modules/users/s6-rc.nix
@@ -124,8 +124,10 @@ let
       # N.B. do not run the notifier from $HOME, else it won't know where to find the `data/check` program.
       # N.B. must be run with `&` + `wait`, else we lose the ability to `trap`.
       ${maybe-notify}env --chdir="$HOME" ${cli} <&0 &
-      wait
-      log "exiting"
+      wait $!
+      status=$?
+      log "exiting; propagating status: $status"
+      exit "$status"
     '';
   in {
     "${name}".dir = {