diff --git a/src/core/core-chat-room.cpp b/src/core/core-chat-room.cpp
index ee9cd8a6c..08f5526a9 100644
--- a/src/core/core-chat-room.cpp
+++ b/src/core/core-chat-room.cpp
@@ -106,11 +106,11 @@ shared_ptr<AbstractChatRoom> CorePrivate::createClientGroupChatRoom (const strin
 
 void CorePrivate::insertChatRoom (const shared_ptr<AbstractChatRoom> &chatRoom) {
 	L_ASSERT(chatRoom);
-	L_Q();
 
-	q->deleteChatRoom(chatRoom);
-	chatRooms.push_back(chatRoom);
-	chatRoomsById[chatRoom->getChatRoomId()] = chatRoom;
+	if (!chatRoomsById[chatRoom->getChatRoomId()]) {
+		chatRooms.push_back(chatRoom);
+		chatRoomsById[chatRoom->getChatRoomId()] = chatRoom;
+	}
 }
 
 void CorePrivate::insertChatRoomWithDb (const shared_ptr<AbstractChatRoom> &chatRoom) {