diff --git a/modules/systemd.nix b/modules/systemd.nix
index f209f65d..1d96ec8d 100644
--- a/modules/systemd.nix
+++ b/modules/systemd.nix
@@ -336,7 +336,7 @@ in {
           ${pkgs.sd-switch}/bin/sd-switch \
             ''${DRY_RUN:+--dry-run} $VERBOSE_ARG ${timeoutArg} \
             ''${oldGenPath:+--old-units $oldGenPath/home-files/.config/systemd/user} \
-            --new-units $newGenPath/home-files/.config/systemd/user
+            --new-units "$newUnitsDir"
         '';
       };
 
@@ -354,8 +354,15 @@ in {
           warnEcho "Attempting to reload services anyway..."
         fi
 
+        newUnitsDir="$newGenPath/home-files/.config/systemd/user"
+        if [[ ! -e $newUnitsDir ]]; then
+          newUnitsDir=${pkgs.emptyDirectory}
+        fi
+
         ${ensureRuntimeDir} \
           ${getAttr cfg.startServices cmd}
+
+        unset newUnitsDir
       else
         echo "User systemd daemon not running. Skipping reload."
       fi