diff --git a/scripts/nix-profile-daemon.fish.in b/scripts/nix-profile-daemon.fish.in
index e7b394d56..5f5a53141 100644
--- a/scripts/nix-profile-daemon.fish.in
+++ b/scripts/nix-profile-daemon.fish.in
@@ -20,7 +20,7 @@ set __ETC_PROFILE_NIX_SOURCED 1
 set --export NIX_PROFILES "@localstatedir@/nix/profiles/default $HOME/.nix-profile"
 
 # Populate bash completions, .desktop files, etc
-if test -n "$NIX_SSH_CERT_FILE"
+if test -n "$XDG_DATA_DIRS"
     # According to XDG spec the default is /usr/local/share:/usr/share, don't set something that prevents that default
     set --export XDG_DATA_DIRS "/usr/local/share:/usr/share:$NIX_LINK/share:/nix/var/nix/profiles/default/share"
 else
diff --git a/scripts/nix-profile.fish.in b/scripts/nix-profile.fish.in
index fc8fe4e97..2523594f2 100644
--- a/scripts/nix-profile.fish.in
+++ b/scripts/nix-profile.fish.in
@@ -21,7 +21,7 @@ if test -n "$HOME" && test -n "$USER"
     set --export NIX_PROFILES "@localstatedir@/nix/profiles/default $HOME/.nix-profile"
 
     # Populate bash completions, .desktop files, etc
-    if test -n "$NIX_SSH_CERT_FILE"
+    if test -n "$XDG_DATA_DIRS"
         # According to XDG spec the default is /usr/local/share:/usr/share, don't set something that prevents that default
         set --export XDG_DATA_DIRS "/usr/local/share:/usr/share:$NIX_LINK/share:/nix/var/nix/profiles/default/share"
     else