diff --git a/data/src/main/java/repository/MessageRepositoryImpl.kt b/data/src/main/java/repository/MessageRepositoryImpl.kt
index 5c80da23..10fccad4 100644
--- a/data/src/main/java/repository/MessageRepositoryImpl.kt
+++ b/data/src/main/java/repository/MessageRepositoryImpl.kt
@@ -250,7 +250,7 @@ class MessageRepositoryImpl @Inject constructor(
                     .where(Message::class.java)
                     .equalTo("threadId", threadId)
                     .sort("date", Sort.DESCENDING)
-                    .findAll().first() ?: return
+                    .findAll().firstOrNull() ?: return
 
             realm.executeTransaction {
                 conversation.date = message.date