diff --git a/plugins/keychain/keychain.plugin.zsh b/plugins/keychain/keychain.plugin.zsh
index 57175ffef..cca7a7f5d 100644
--- a/plugins/keychain/keychain.plugin.zsh
+++ b/plugins/keychain/keychain.plugin.zsh
@@ -26,7 +26,7 @@ function keychain() {
       ;;
     "kill")
       echo "Stopping agent"
-      ssh-agent -k >/dev/null
+      ssh-agent -k >/dev/null && [[ -f $ssh_env ]] && rm $ssh_env
       ;;
   esac
 }