diff --git a/lib/imap.c b/lib/imap.c
index 469dad32d986b65eb50d886d946f97f2be9f17b9..288d1994f349aef0c1e0da35016f70f493839900 100644
--- a/lib/imap.c
+++ b/lib/imap.c
@@ -629,7 +629,7 @@ static CURLcode imap_state_starttls_resp(struct connectdata *conn,
   }
   else {
     state(conn, IMAP_UPGRADETLS);
-    return imap_state_upgrade_tls(conn);
+    result = imap_state_upgrade_tls(conn);
   }
 
   return result;
@@ -1628,8 +1628,6 @@ static CURLcode imap_regular_transfer(struct connectdata *conn,
       return CURLE_OK;
 
     result = imap_dophase_done(conn, connected);
-    if(result)
-      return result;
   }
 
   return result;
diff --git a/lib/pop3.c b/lib/pop3.c
index cb86911dd5a85482a9adbc3d1049a226008e86a3..eabcd3004c587d50d8063cc88d315bae375183b2 100644
--- a/lib/pop3.c
+++ b/lib/pop3.c
@@ -1608,8 +1608,6 @@ static CURLcode pop3_regular_transfer(struct connectdata *conn,
       return CURLE_OK;
 
     result = pop3_dophase_done(conn, connected);
-    if(result)
-      return result;
   }
 
   return result;
diff --git a/lib/smtp.c b/lib/smtp.c
index af3fb0680b38cc70e7e955148045f34b3208fd90..05c0a780a28853fa24eff2272705f1cd6d999203 100644
--- a/lib/smtp.c
+++ b/lib/smtp.c
@@ -492,7 +492,7 @@ static CURLcode smtp_state_starttls_resp(struct connectdata *conn,
   }
   else {
     state(conn, SMTP_UPGRADETLS);
-    return smtp_state_upgrade_tls(conn);
+    result = smtp_state_upgrade_tls(conn);
   }
 
   return result;
@@ -1599,8 +1599,6 @@ static CURLcode smtp_regular_transfer(struct connectdata *conn,
       return CURLE_OK;
 
     result = smtp_dophase_done(conn, connected);
-    if(result)
-      return result;
   }
 
   return result;