diff --git a/lib/imap.c b/lib/imap.c
index 8525c89be..4621a8ff6 100644
--- a/lib/imap.c
+++ b/lib/imap.c
@@ -1457,6 +1457,7 @@ static CURLcode imap_done(struct connectdata *conn, CURLcode status,
   CURLcode result = CURLE_OK;
   struct SessionHandle *data = conn->data;
   struct FTP *imap = data->state.proto.imap;
+  struct imap_conn *imapc= &conn->proto.imapc;
 
   (void)premature;
 
@@ -1473,6 +1474,9 @@ static CURLcode imap_done(struct connectdata *conn, CURLcode status,
     result = status;         /* use the already set error code */
   }
 
+  /* Cleanup our per-request based variables */
+  Curl_safefree(imapc->mailbox);
+
   /* Clear the transfer mode for the next connection */
   imap->transfer = FTPTRANSFER_BODY;
 
@@ -1604,9 +1608,6 @@ static CURLcode imap_disconnect(struct connectdata *conn, bool dead_connection)
   /* Cleanup the SASL module */
   Curl_sasl_cleanup(conn, imapc->authused);
 
-  /* Cleanup our connection based variables */
-  Curl_safefree(imapc->mailbox);
-
   return CURLE_OK;
 }