diff --git a/zsh/gpg.zsh b/zsh/gpg.zsh
index 1d2e9c2..0a4b664 100644
--- a/zsh/gpg.zsh
+++ b/zsh/gpg.zsh
@@ -1,3 +1,10 @@
 gpgconf --launch gpg-agent
 
 export SSH_AUTH_SOCK="$HOME/.gnupg/S.gpg-agent.ssh"
+
+TSOCK=$(gpgconf --list-dirs agent-ssh-socket || true)
+if [[ -n "$TSOCK" ]]
+then
+    export SSH_AUTH_SOCK="$TSOCK"
+    unset TSOCK
+fi