diff --git a/app/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt b/app/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt
index d6e2e053f5..7c99f04146 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt
@@ -298,7 +298,12 @@ object LocalCache {
 
     val author = getOrCreateUser(event.pubKey)
     val mentions = Collections.synchronizedList(event.mentions.map { getOrCreateUser(decodePublicKey(it)) })
-    val replyTo = Collections.synchronizedList(event.replyTos.map { channel.getOrCreateNote(it) }.toMutableList())
+    val replyTo = Collections.synchronizedList(
+      event.replyTos
+        .map { channel.getOrCreateNote(it) }
+        .filter { it.event !is ChannelCreateEvent }
+        .toMutableList()
+    )
 
     note.channel = channel
     note.loadEvent(event, author, mentions, replyTo)