diff --git a/modules/services/gpg-agent.nix b/modules/services/gpg-agent.nix
index 16a4723fe..8237c6f7b 100644
--- a/modules/services/gpg-agent.nix
+++ b/modules/services/gpg-agent.nix
@@ -186,6 +186,9 @@ in
 
       programs.bash.initExtra = gpgInitStr;
       programs.zsh.initExtra = gpgInitStr;
+      programs.fish.interactiveShellInit = ''
+        set -gx GPG_TTY (tty)
+      '';
     }
 
     (mkIf (cfg.sshKeys != null) {