diff --git a/modules/gpg-agent/init.zsh b/modules/gpg-agent/init.zsh
index c8521d65..bc636bad 100644
--- a/modules/gpg-agent/init.zsh
+++ b/modules/gpg-agent/init.zsh
@@ -5,6 +5,7 @@
 #   Florian Walch <florian.walch@gmx.at>
 #   Sorin Ionescu <sorin.ionescu@gmail.com>
 #   neersighted <neersighted@myopera.com>
+#   Jakob Hetzelein <nasenatmer@posteo.de>
 #
 
 # Return if requirements are not found.
@@ -33,7 +34,7 @@ function _gpg-agent-start {
 # Source GPG agent settings, if applicable.
 if [[ -s "${_gpg_env}" ]]; then
   source "${_gpg_env}" > /dev/null
-  ps -e | grep $(grep GPG_AGENT_INFO $_gpg_env | cut -d: -f 2) ||
+  ps -e | grep $(grep GPG_AGENT_INFO $_gpg_env | cut -d: -f 2) | grep -q gpg-agent ||
     _gpg-agent-start
   }
 else