diff --git a/bin/startagent b/bin/startagent
index e0e0507..3d94215 100755
--- a/bin/startagent
+++ b/bin/startagent
@@ -368,7 +368,14 @@ ssh-runinagent () {
 
 }
 
-agent-start-or-restart $ssh_identity
-! $createonly && agent-load-identity-keys $ssh_identity
+if [ $SSH_TTY ] ; then
+    echo remote >&2
+    res=1
+else
+    echo local >&2
+    agent-start-or-restart $ssh_identity
+    ! $createonly && agent-load-identity-keys $ssh_identity
+    res=0
+fi
 SCRIPTEXIT
-exit $?
+exit $res