diff --git a/app/src/main/java/com/nextcloud/talk/newarch/local/dao/MessagesDao.kt b/app/src/main/java/com/nextcloud/talk/newarch/local/dao/MessagesDao.kt
index aeadfb866..6e124f3f1 100644
--- a/app/src/main/java/com/nextcloud/talk/newarch/local/dao/MessagesDao.kt
+++ b/app/src/main/java/com/nextcloud/talk/newarch/local/dao/MessagesDao.kt
@@ -84,7 +84,8 @@ abstract class MessagesDao {
                 }
             }
 
-            messagesToUpdate.forEach { internalUpsert(it) }
+            saveMessages(*messagesToUpdate.toTypedArray())
+            //messagesToUpdate.forEach { internalUpsert(it) }
         }
     }