diff --git a/src/db/main-db.cpp b/src/db/main-db.cpp
index f7c59dc57..62a463c5d 100644
--- a/src/db/main-db.cpp
+++ b/src/db/main-db.cpp
@@ -272,8 +272,12 @@ MainDb::MainDb (const shared_ptr<Core> &core) : AbstractDb(*new MainDbPrivate),
 		if (!chatRoom->canHandleParticipants())
 			return id;
 
-		shared_ptr<Participant> me = chatRoom->getMe();
-		insertChatRoomParticipant(id, insertSipAddress(me->getAddress().asString()), me->isAdmin());
+		// Do not add 'me' when creating a server-group-chat-room.
+		if (chatRoomId.getLocalAddress() != chatRoomId.getPeerAddress()) {
+			shared_ptr<Participant> me = chatRoom->getMe();
+			insertChatRoomParticipant(id, insertSipAddress(me->getAddress().asString()), me->isAdmin());
+		}
+
 		for (const auto &participant : chatRoom->getParticipants())
 			insertChatRoomParticipant(id, insertSipAddress(participant->getAddress().asString()), participant->isAdmin());