diff --git a/plugins/gpg-agent/gpg-agent.plugin.zsh b/plugins/gpg-agent/gpg-agent.plugin.zsh
index 69e239cc..0827a489 100644
--- a/plugins/gpg-agent/gpg-agent.plugin.zsh
+++ b/plugins/gpg-agent/gpg-agent.plugin.zsh
@@ -1,5 +1,5 @@
 # Enable gpg-agent if it is not running
-GPG_AGENT_SOCKET="${XDG_RUNTIME_DIR}/gnupg/S.gpg-agent.ssh"
+GPG_AGENT_SOCKET="$(gpgconf --list-dirs agent-ssh-socket)"
 if [ ! -S $GPG_AGENT_SOCKET ]; then
   gpg-agent --daemon >/dev/null 2>&1
   export GPG_TTY=$(tty)