diff --git a/app/src/main/java/com/nextcloud/talk/chat/ScheduledMessagesActivity.kt b/app/src/main/java/com/nextcloud/talk/chat/ScheduledMessagesActivity.kt
index 6f6f14708f..fa18d31a9c 100644
--- a/app/src/main/java/com/nextcloud/talk/chat/ScheduledMessagesActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/chat/ScheduledMessagesActivity.kt
@@ -545,7 +545,7 @@ class ScheduledMessagesActivity : BaseActivity() {
 
                                         items(
                                             items = grouped[date].orEmpty(),
-                                            key = { it.token ?: "" }
+                                            key = { it.jsonMessageId }
                                         ) { message ->
 
                                             val parentId = message.parentMessageId