diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/model/ChatMessageEvent.kt b/app/src/main/java/com/vitorpamplona/amethyst/service/model/ChatMessageEvent.kt
index 6b8788d34..23b6c7a4c 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/service/model/ChatMessageEvent.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/service/model/ChatMessageEvent.kt
@@ -29,16 +29,18 @@ class ChatMessageEvent(
     fun talkingWith(oneSideHex: String): Set<HexKey> {
         val listedPubKeys = recipientsPubKey()
 
-        return if (pubKey == oneSideHex) {
-            if (listedPubKeys.isEmpty()) {
-                // talking to myself
-                return setOf(pubKey)
-            } else {
-                listedPubKeys.minus(oneSideHex).toSet()
-            }
+        val result = if (pubKey == oneSideHex) {
+            listedPubKeys.minus(oneSideHex).toSet()
         } else {
             listedPubKeys.plus(pubKey).minus(oneSideHex).toSet()
         }
+
+        if (result.isEmpty()) {
+            // talking to myself
+            return setOf(pubKey)
+        }
+
+        return result
     }
 
     override fun chatroomKey(toRemove: String): ChatroomKey {