diff --git a/composeApp/src/androidMain/kotlin/su/reya/coop/screens/ChatScreen.kt b/composeApp/src/androidMain/kotlin/su/reya/coop/screens/ChatScreen.kt
index 2907e2d..0e7db46 100644
--- a/composeApp/src/androidMain/kotlin/su/reya/coop/screens/ChatScreen.kt
+++ b/composeApp/src/androidMain/kotlin/su/reya/coop/screens/ChatScreen.kt
@@ -234,9 +234,10 @@ fun ChatScreen(id: Long, screening: Boolean = false) {
                             ) {
                                 groupedMessages.forEach { (dateHeader, messagesInGroup) ->
                                     items(
-                                        messagesInGroup,
-                                        key = { it.id()?.toBech32()!! }) { event ->
-                                        ChatMessage(event)
+                                        items = messagesInGroup,
+                                        key = { it.id()?.toBech32() ?: it.hashCode() }
+                                    ) {
+                                        ChatMessage(it)
                                     }
                                     item {
                                         DateSeparator(dateHeader)