diff --git a/src/user.cpp b/src/user.cpp
index d95ad8a90d5757753d85824efc7e81fd5de6064f..fff621103c1eaf7ed4b94e6881ef1496556209fa 100644
--- a/src/user.cpp
+++ b/src/user.cpp
@@ -217,6 +217,12 @@ void User::handlePresence(Swift::Presence::ref presence) {
 			std::string room = Buddy::JIDToLegacyName(presence->getTo());
 			LOG4CXX_INFO(logger, m_jid.toString() << ": Going to left room " << room);
 			onRoomLeft(room);
+
+			Conversation *conv = m_conversationManager->getConversation(room);
+			if (conv) {
+				m_conversationManager->removeConversation(conv);
+				delete conv;
+			}
 		}
 		else {
 			// force connection to legacy network to let backend to handle auto-join on connect.