diff --git a/src/auth.c b/src/auth.c
index 5b8f748f..f44f24af 100644
--- a/src/auth.c
+++ b/src/auth.c
@@ -1107,13 +1107,11 @@ int ssh_userauth_publickey_auto(ssh_session session,
     state = session->auth_auto_state;
     if (state->state == SSH_AUTH_AUTO_STATE_NONE) {
 #ifndef _WIN32
-    /* Try authentication with ssh-agent first */
+        /* Try authentication with ssh-agent first */
         rc = ssh_userauth_agent(session, username);
-        if (rc == SSH_AUTH_SUCCESS) {
+        if (rc == SSH_AUTH_SUCCESS || rc == SSH_AUTH_AGAIN) {
             return rc;
         }
-        if (rc == SSH_AUTH_AGAIN)
-            return rc;
 #endif
         state->state = SSH_AUTH_AUTO_STATE_PUBKEY;
     }