diff --git a/src/add-ons/mail_daemon/inbound_protocols/imap/imap_lib/IMAPProtocol.cpp b/src/add-ons/mail_daemon/inbound_protocols/imap/imap_lib/IMAPProtocol.cpp
index b66886e465..79b512f986 100644
--- a/src/add-ons/mail_daemon/inbound_protocols/imap/imap_lib/IMAPProtocol.cpp
+++ b/src/add-ons/mail_daemon/inbound_protocols/imap/imap_lib/IMAPProtocol.cpp
@@ -414,6 +414,7 @@ IMAPProtocol::_ProcessCommandWithoutAfterQuake(const char* command,
 status_t
 IMAPProtocol::_Disconnect()
 {
+	fOngoingCommands.clear();
 	fIsConnected = false;
 	return fOwnServerConnection.Disconnect();
 }