diff --git a/app/src/main/java/org/linphone/ui/call/viewmodel/CurrentCallViewModel.kt b/app/src/main/java/org/linphone/ui/call/viewmodel/CurrentCallViewModel.kt
index 483bf1303..9428233ad 100644
--- a/app/src/main/java/org/linphone/ui/call/viewmodel/CurrentCallViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/call/viewmodel/CurrentCallViewModel.kt
@@ -1351,14 +1351,13 @@ class CurrentCallViewModel
 
     @WorkerThread
     private fun createCurrentCallConversation(call: Call) {
-        val localAddress = call.callLog.localAddress
         val remoteAddress = call.remoteAddress
         val participants = arrayOf(remoteAddress)
         val core = call.core
         operationInProgress.postValue(true)
 
         val params = getChatRoomParams(call) ?: return // TODO: show error to user
-        val chatRoom = core.createChatRoom(params, localAddress, participants)
+        val chatRoom = core.createChatRoom(params, participants)
         if (chatRoom != null) {
             if (params.chatParams?.backend == ChatRoom.Backend.FlexisipChat) {
                 if (chatRoom.state == ChatRoom.State.Created) {
@@ -1398,6 +1397,8 @@ class CurrentCallViewModel
         params.isChatEnabled = true
         params.isGroupEnabled = false
         params.subject = AppUtils.getString(R.string.conversation_one_to_one_hidden_subject)
+        params.account = account
+
         val chatParams = params.chatParams ?: return null
         chatParams.ephemeralLifetime = 0 // Make sure ephemeral is disabled by default
 
diff --git a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationForwardMessageViewModel.kt b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationForwardMessageViewModel.kt
index db0f32397..569359e30 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationForwardMessageViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationForwardMessageViewModel.kt
@@ -174,6 +174,8 @@ class ConversationForwardMessageViewModel
         params.isChatEnabled = true
         params.isGroupEnabled = false
         params.subject = AppUtils.getString(R.string.conversation_one_to_one_hidden_subject)
+        params.account = account
+
         val chatParams = params.chatParams ?: return
         chatParams.ephemeralLifetime = 0 // Make sure ephemeral is disabled by default
 
@@ -212,7 +214,7 @@ class ConversationForwardMessageViewModel
             Log.i(
                 "$TAG No existing 1-1 conversation between local account [${localAddress?.asStringUriOnly()}] and remote [${remote.asStringUriOnly()}] was found for given parameters, let's create it"
             )
-            val chatRoom = core.createChatRoom(params, localAddress, participants)
+            val chatRoom = core.createChatRoom(params, participants)
             if (chatRoom != null) {
                 if (chatParams.backend == ChatRoom.Backend.FlexisipChat) {
                     if (chatRoom.state == ChatRoom.State.Created) {
diff --git a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/StartConversationViewModel.kt b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/StartConversationViewModel.kt
index 057f6566d..3e7c26156 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/StartConversationViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/StartConversationViewModel.kt
@@ -112,6 +112,8 @@ class StartConversationViewModel
             params.isGroupEnabled = true
             params.subject = groupChatRoomSubject
             params.securityLevel = Conference.SecurityLevel.EndToEnd
+            params.account = account
+
             val chatParams = params.chatParams ?: return@postOnCoreThread
             chatParams.ephemeralLifetime = 0 // Make sure ephemeral is disabled by default
             chatParams.backend = ChatRoom.Backend.FlexisipChat
@@ -120,14 +122,9 @@ class StartConversationViewModel
             for (participant in selection.value.orEmpty()) {
                 participants.add(participant.address)
             }
-            val localAddress = account.params.identityAddress
 
             val participantsArray = arrayOf<Address>()
-            val chatRoom = core.createChatRoom(
-                params,
-                localAddress,
-                participants.toArray(participantsArray)
-            )
+            val chatRoom = core.createChatRoom(params, participants.toArray(participantsArray))
             if (chatRoom != null) {
                 if (chatParams.backend == ChatRoom.Backend.FlexisipChat) {
                     if (chatRoom.state == ChatRoom.State.Created) {
@@ -176,6 +173,8 @@ class StartConversationViewModel
         params.isChatEnabled = true
         params.isGroupEnabled = false
         params.subject = AppUtils.getString(R.string.conversation_one_to_one_hidden_subject)
+        params.account = account
+
         val chatParams = params.chatParams ?: return
         chatParams.ephemeralLifetime = 0 // Make sure ephemeral is disabled by default
 
@@ -216,7 +215,7 @@ class StartConversationViewModel
             Log.i(
                 "$TAG No existing 1-1 conversation between local account [${localAddress?.asStringUriOnly()}] and remote [${remote.asStringUriOnly()}] was found for given parameters, let's create it"
             )
-            val chatRoom = core.createChatRoom(params, localAddress, participants)
+            val chatRoom = core.createChatRoom(params, participants)
             if (chatRoom != null) {
                 if (chatParams.backend == ChatRoom.Backend.FlexisipChat) {
                     val state = chatRoom.state
diff --git a/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactViewModel.kt b/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactViewModel.kt
index e78fa9e43..7cbb7090e 100644
--- a/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactViewModel.kt
@@ -499,6 +499,8 @@ class ContactViewModel
             params.isChatEnabled = true
             params.isGroupEnabled = false
             params.subject = AppUtils.getString(R.string.conversation_one_to_one_hidden_subject)
+            params.account = account
+
             val chatParams = params.chatParams ?: return
             chatParams.ephemeralLifetime = 0 // Make sure ephemeral is disabled by default
 
@@ -546,7 +548,7 @@ class ContactViewModel
                     "$TAG No existing conversation between [$localSipUri] and [$remoteSipUri] was found, let's create it"
                 )
                 operationInProgress.postValue(true)
-                val chatRoom = core.createChatRoom(params, localAddress, participants)
+                val chatRoom = core.createChatRoom(params, participants)
                 if (chatRoom != null) {
                     if (chatParams.backend == ChatRoom.Backend.FlexisipChat) {
                         if (chatRoom.state == ChatRoom.State.Created) {
diff --git a/app/src/main/java/org/linphone/ui/main/history/viewmodel/HistoryViewModel.kt b/app/src/main/java/org/linphone/ui/main/history/viewmodel/HistoryViewModel.kt
index 5d12485df..9f51fd231 100644
--- a/app/src/main/java/org/linphone/ui/main/history/viewmodel/HistoryViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/history/viewmodel/HistoryViewModel.kt
@@ -228,6 +228,8 @@ class HistoryViewModel
                 params.isChatEnabled = true
                 params.isGroupEnabled = false
                 params.subject = AppUtils.getString(R.string.conversation_one_to_one_hidden_subject)
+                params.account = account
+
                 val chatParams = params.chatParams ?: return@postOnCoreThread
                 chatParams.ephemeralLifetime = 0 // Make sure ephemeral is disabled by default
 
@@ -275,7 +277,7 @@ class HistoryViewModel
                         "$TAG No existing conversation between [$localSipUri] and [$remoteSipUri] was found, let's create it"
                     )
                     operationInProgress.postValue(true)
-                    val chatRoom = core.createChatRoom(params, localAddress, participants)
+                    val chatRoom = core.createChatRoom(params, participants)
                     if (chatRoom != null) {
                         if (chatParams.backend == ChatRoom.Backend.FlexisipChat) {
                             if (chatRoom.state == ChatRoom.State.Created) {