diff --git a/src/core/core-chat-room.cpp b/src/core/core-chat-room.cpp
index 745a3944d..e9bc24996 100644
--- a/src/core/core-chat-room.cpp
+++ b/src/core/core-chat-room.cpp
@@ -106,9 +106,13 @@ shared_ptr<AbstractChatRoom> CorePrivate::createClientGroupChatRoom (const strin
 
 void CorePrivate::insertChatRoom (const shared_ptr<AbstractChatRoom> &chatRoom) {
 	L_ASSERT(chatRoom);
-	L_ASSERT(!chatRoomsById[chatRoom->getChatRoomId()]);
-	chatRooms.push_back(chatRoom);
-	chatRoomsById[chatRoom->getChatRoomId()] = chatRoom;
+	L_ASSERT(!chatRoomsById[chatRoom->getChatRoomId()]
+		|| (chatRoomsById[chatRoom->getChatRoomId()] == chatRoom)
+	);
+	if (!chatRoomsById[chatRoom->getChatRoomId()]) {
+		chatRooms.push_back(chatRoom);
+		chatRoomsById[chatRoom->getChatRoomId()] = chatRoom;
+	}
 }
 
 void CorePrivate::insertChatRoomWithDb (const shared_ptr<AbstractChatRoom> &chatRoom) {