diff --git a/lib/pop3.c b/lib/pop3.c
index 9a9e81b20..18d16e0ff 100644
--- a/lib/pop3.c
+++ b/lib/pop3.c
@@ -542,7 +542,8 @@ static CURLcode pop3_state_servergreet_resp(struct connectdata *conn,
     /* We don't have a SSL/TLS connection yet, but SSL is requested. Switch
        to TLS connection now */
     result = Curl_pp_sendf(&pop3c->pp, "STLS");
-    state(conn, POP3_STARTTLS);
+    if(!result)
+      state(conn, POP3_STARTTLS);
   }
   else
     result = pop3_state_capa(conn);