diff --git a/lib/smtp.c b/lib/smtp.c
index 2433a64474f1fda08adcd93893f1a2c4651f5695..6204de0e8bdd649be5ad4a8c08b1520d8e647b31 100644
--- a/lib/smtp.c
+++ b/lib/smtp.c
@@ -543,7 +543,8 @@ static CURLcode smtp_state_ehlo_resp(struct connectdata *conn, int smtpcode,
     /* We don't have a SSL/TLS connection yet, but SSL is requested. Switch
        to TLS connection now */
     result = Curl_pp_sendf(&conn->proto.smtpc.pp, "STARTTLS");
-    state(conn, SMTP_STARTTLS);
+    if(!result)
+      state(conn, SMTP_STARTTLS);
   }
   else
     result = smtp_authenticate(conn);