diff --git a/data/src/main/java/network/columba/app/data/db/dao/MessageDao.kt b/data/src/main/java/network/columba/app/data/db/dao/MessageDao.kt
index 5a3124f09..a2c51a8d7 100644
--- a/data/src/main/java/network/columba/app/data/db/dao/MessageDao.kt
+++ b/data/src/main/java/network/columba/app/data/db/dao/MessageDao.kt
@@ -164,7 +164,7 @@ interface MessageDao {
         """
         SELECT * FROM messages
         WHERE conversationHash = :peerHash AND identityHash = :identityHash
-        ORDER BY COALESCE(receivedAt, timestamp) DESC
+        ORDER BY COALESCE(receivedAt, timestamp) DESC, rowid DESC
         """,
     )
     fun getMessagesForConversationPaged(
@@ -179,7 +179,7 @@ interface MessageDao {
         """
         SELECT * FROM messages
         WHERE conversationHash = :peerHash AND identityHash = :identityHash
-        ORDER BY timestamp DESC
+        ORDER BY timestamp DESC, rowid DESC
         """,
     )
     fun getMessagesForConversationPagedBySentTime(