diff --git a/lib/smtp.c b/lib/smtp.c
index 76ed4f280a..30f8535765 100644
--- a/lib/smtp.c
+++ b/lib/smtp.c
@@ -1136,7 +1136,7 @@ static CURLcode smtp_state_command_resp(struct Curl_easy *data,
     if(!data->req.no_body)
       result = Curl_client_write(data, CLIENTWRITE_BODY, line, len);
 
-    if(smtpcode != 1) {
+    if(!result && (smtpcode != 1)) {
       if(smtp->rcpt) {
         smtp->rcpt = smtp->rcpt->next;