diff --git a/functions/__ssh_agent_is_started.fish b/functions/__ssh_agent_is_started.fish
index db14558..7d481ee 100644
--- a/functions/__ssh_agent_is_started.fish
+++ b/functions/__ssh_agent_is_started.fish
@@ -3,7 +3,7 @@ function __ssh_agent_is_started -d "check if ssh agent is already started"
 		source $SSH_ENV > /dev/null
 	end
 
-	if test -z "$SSH_AGENT_PID"
+	if begin; test -z "$SSH_AGENT_PID"; and test -z "$SSH_CONNECTION"; end
 		return 1
 	end