diff --git a/zsh/ssh-agent b/zsh/ssh-agent
new file mode 100644
index 0000000..9f6cf69
--- /dev/null
+++ b/zsh/ssh-agent
@@ -0,0 +1,5 @@
+if [[ ${EUID} != 0 ]]; then
+  if [[ -e "${HOME}/.ssh/id_rsa" ]]; then
+    ssh-add </dev/null
+  fi
+fi
diff --git a/zshrc b/zshrc
index 3006d6b..6e05eac 100644
--- a/zshrc
+++ b/zshrc
@@ -102,11 +102,6 @@ export GCC_COLOR="auto"
 for _DIR in $(find "${HOME}/.local/bin" -type d 2> /dev/null); do export PATH="${_DIR}:${PATH}"; done
 # fix urxvt
 if [[ ${TERM} =~ "rxvt-unicode-*" ]] export TERM="xterm"
-# ssh-agent
-if [[ ${EUID} != 0 ]]; then
-  eval $(ssh-agent) > /dev/null
-  ssh-add -l > /dev/null || alias ssh='ssh-add -l >/dev/null || ssh-add && unalias ssh; ssh'
-fi
 
 ## load custom settings from $HOME/.zsh
 for _SCR in $(find "${HOME}/.zsh/" -type 'f' -or -type 'l' 2> /dev/null); do source "${_SCR}"; done