diff --git a/modules/home-environment.nix b/modules/home-environment.nix
index 7f51cd8a3..4b14d2d40 100644
--- a/modules/home-environment.nix
+++ b/modules/home-environment.nix
@@ -370,7 +370,7 @@ in
         + optionalString (!cfg.emptyActivationPath) "\${PATH:+:}$PATH";
 
         activationScript = pkgs.writeScript "activation-script" ''
-          #!${pkgs.stdenv.shell}
+          #!${pkgs.runtimeShell}
 
           set -eu
           set -o pipefail
diff --git a/modules/programs/notmuch.nix b/modules/programs/notmuch.nix
index e39747c8b..cd0b1384a 100644
--- a/modules/programs/notmuch.nix
+++ b/modules/programs/notmuch.nix
@@ -188,7 +188,7 @@ in
           {
             target = "${notmuchIni.database.path}/.notmuch/hooks/${name}";
             source = pkgs.writeScript name ''
-              #!${pkgs.stdenv.shell}
+              #!${pkgs.runtimeShell}
 
               export PATH="${pkgs.notmuch}/bin''${PATH:+:}$PATH"
               export NOTMUCH_CONFIG="${config.xdg.configHome}/notmuch/notmuchrc"
diff --git a/modules/services/emacs.nix b/modules/services/emacs.nix
index 216645475..33d6871c6 100644
--- a/modules/services/emacs.nix
+++ b/modules/services/emacs.nix
@@ -35,7 +35,7 @@ in
       };
 
       Service = {
-        ExecStart = "${pkgs.stdenv.shell} -l -c 'exec ${emacsBinPath}/emacs --fg-daemon'";
+        ExecStart = "${pkgs.runtimeShell} -l -c 'exec ${emacsBinPath}/emacs --fg-daemon'";
         ExecStop = "${emacsBinPath}/emacsclient --eval '(kill-emacs)'";
         Restart = "on-failure";
       };
diff --git a/nixos/default.nix b/nixos/default.nix
index 29803ddcc..8e616d9e2 100644
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -108,7 +108,7 @@ in
             # The activation script is run by a login shell to make sure
             # that the user is given a sane Nix environment.
             ExecStart = pkgs.writeScript "activate-${username}" ''
-              #! ${pkgs.stdenv.shell} -el
+              #! ${pkgs.runtimeShell} -el
               echo Activating home-manager configuration for ${username}
               exec ${usercfg.home.activationPackage}/activate
             '';