diff --git a/defaults/shell.nix b/defaults/shell.nix
index 53e770e..2bd324e 100644
--- a/defaults/shell.nix
+++ b/defaults/shell.nix
@@ -47,7 +47,7 @@ in
   config = lib.mkIf cfg.enable {
     # use Fish, the nicest shell :)
     programs.fish.enable = lib.mkIf config.nixowos.allowAddingPackages true;
-    users.defaultUserShell = lib.mkIf config.nixowos.allowAddingPackages pkgs.fish;
+    users.defaultUserShell = lib.mkIf config.programs.fish.enable config.programs.fish.package;
 
     environment.shellAliases = {
       # make nix-shell preserve the user's $SHELL