diff --git a/src/chat/chat-room/client-group-chat-room.cpp b/src/chat/chat-room/client-group-chat-room.cpp
index d04aedf98..3422a19b7 100644
--- a/src/chat/chat-room/client-group-chat-room.cpp
+++ b/src/chat/chat-room/client-group-chat-room.cpp
@@ -45,7 +45,7 @@ list<Address> ClientGroupChatRoomPrivate::cleanAddressesList (const list<Address
 	cleanedList.sort();
 	cleanedList.unique();
 	for (auto it = cleanedList.begin(); it != cleanedList.end();) {
-		if (q->findParticipant(*it))
+		if (q->findParticipant(*it) || (q->getMe()->getAddress() == SimpleAddress(*it)))
 			it = cleanedList.erase(it);
 		else
 			it++;