diff --git a/src/scripts/aa-stage3 b/src/scripts/aa-stage3
index f7f1a7a..405bf52 100755
--- a/src/scripts/aa-stage3
+++ b/src/scripts/aa-stage3
@@ -44,7 +44,7 @@ foreground { aa-echo -DB "Stage 3: Preparing ${1}..." }
 # Stop all running services -- s6-svscan did only exec into us, leaving the
 # whole supervised tree intact. Here we stop everything (longrun & oneshot) in
 # order, save for the catch-all (it will get an 'x' though).
-foreground { emptyenv -c s6-setsid aa-ctty -Ds aa-stop -D -aak uncaught-logs }
+foreground { emptyenv -c s6-setsid aa-ctty -Ds aa-stop -D -aak uncaught-logs -t20 }
 # Now stop the catch-all logger (its supervisor will then exit)
 foreground { emptyenv -c s6-setsid aa-stop -D uncaught-logs }