diff --git a/app/src/androidTest/java/com/nextcloud/talk/data/database/dao/ChatBlocksDaoTest.kt b/app/src/androidTest/java/com/nextcloud/talk/data/database/dao/ChatBlocksDaoTest.kt
index 6b2b06ecf..8e077f863 100644
--- a/app/src/androidTest/java/com/nextcloud/talk/data/database/dao/ChatBlocksDaoTest.kt
+++ b/app/src/androidTest/java/com/nextcloud/talk/data/database/dao/ChatBlocksDaoTest.kt
@@ -215,6 +215,7 @@ class ChatBlocksDaoTest {
             lobbyState = ConversationEnums.LobbyState.LOBBY_STATE_MODERATORS_ONLY,
             lobbyTimer = 0,
             objectType = ConversationEnums.ObjectType.FILE,
+            objectId = "",
             statusIcon = null,
             description = "",
             displayName = "",
diff --git a/app/src/androidTest/java/com/nextcloud/talk/data/database/dao/ChatMessagesDaoTest.kt b/app/src/androidTest/java/com/nextcloud/talk/data/database/dao/ChatMessagesDaoTest.kt
index 7b3f6876d..a6f8386e7 100644
--- a/app/src/androidTest/java/com/nextcloud/talk/data/database/dao/ChatMessagesDaoTest.kt
+++ b/app/src/androidTest/java/com/nextcloud/talk/data/database/dao/ChatMessagesDaoTest.kt
@@ -211,6 +211,7 @@ class ChatMessagesDaoTest {
             lobbyState = ConversationEnums.LobbyState.LOBBY_STATE_MODERATORS_ONLY,
             lobbyTimer = 0,
             objectType = ConversationEnums.ObjectType.FILE,
+            objectId = "",
             statusIcon = null,
             description = "",
             displayName = "",
diff --git a/app/src/main/java/com/nextcloud/talk/models/domain/ConversationModel.kt b/app/src/main/java/com/nextcloud/talk/models/domain/ConversationModel.kt
index d9c30ee22..5e1f845d3 100644
--- a/app/src/main/java/com/nextcloud/talk/models/domain/ConversationModel.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/domain/ConversationModel.kt
@@ -67,6 +67,7 @@ class ConversationModel(
 ) {
 
     companion object {
+        @Suppress("LongMethod")
         fun mapToConversationModel(conversation: Conversation, user: User): ConversationModel {
             return ConversationModel(
                 internalId = user.id!!.toString() + "@" + conversation.token,