diff --git a/src/core/core-chat-room.cpp b/src/core/core-chat-room.cpp
index 98339fadf..8c50269e2 100644
--- a/src/core/core-chat-room.cpp
+++ b/src/core/core-chat-room.cpp
@@ -172,8 +172,10 @@ shared_ptr<AbstractChatRoom> Core::findOneToOneChatRoom (
 	for (const auto &chatRoom : d->chatRooms) {
 		if (
 			chatRoom->getParticipantCount() == 1 &&
-			chatRoom->getLocalAddress() == localAddress &&
-			participantAddress == chatRoom->getParticipants().front()->getAddress()
+			(
+			 (chatRoom->getLocalAddress() == localAddress && participantAddress == chatRoom->getParticipants().front()->getAddress()) ||
+			 (chatRoom->getLocalAddress() == localAddress.getAddressWithoutGruu() && chatRoom->getPeerAddress() == participantAddress)
+			)
 		)
 			return chatRoom;
 	}