diff --git a/src/add-ons/mail_daemon/inbound_protocols/imap/IMAPConnectionWorker.cpp b/src/add-ons/mail_daemon/inbound_protocols/imap/IMAPConnectionWorker.cpp
index 308d08c761..ba0c2c2f82 100644
--- a/src/add-ons/mail_daemon/inbound_protocols/imap/IMAPConnectionWorker.cpp
+++ b/src/add-ons/mail_daemon/inbound_protocols/imap/IMAPConnectionWorker.cpp
@@ -865,6 +865,7 @@ void
 IMAPConnectionWorker::_Disconnect()
 {
 	fProtocol.Disconnect();
+	fSelectedBox = NULL;
 }