diff --git a/app/src/main/java/org/linphone/activities/chat_bubble/ChatBubbleActivity.kt b/app/src/main/java/org/linphone/activities/chat_bubble/ChatBubbleActivity.kt
index ddcdefa5b..4137e31fc 100644
--- a/app/src/main/java/org/linphone/activities/chat_bubble/ChatBubbleActivity.kt
+++ b/app/src/main/java/org/linphone/activities/chat_bubble/ChatBubbleActivity.kt
@@ -38,6 +38,7 @@ import org.linphone.activities.main.chat.viewmodels.*
 import org.linphone.activities.main.viewmodels.ListTopBarViewModel
 import org.linphone.core.ChatRoom
 import org.linphone.core.ChatRoomListenerStub
+import org.linphone.core.ChatRoomParams
 import org.linphone.core.EventLog
 import org.linphone.core.Factory
 import org.linphone.core.tools.Log
@@ -82,8 +83,10 @@ class ChatBubbleActivity : GenericActivity() {
             )
             val localAddress = Factory.instance().createAddress(localSipUri)
             val remoteSipAddress = Factory.instance().createAddress(remoteSipUri)
+
+            val params: ChatRoomParams? = null
             chatRoom = coreContext.core.searchChatRoom(
-                null,
+                params,
                 localAddress,
                 remoteSipAddress,
                 arrayOfNulls(
diff --git a/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt b/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt
index 8b105a700..40720c3cd 100644
--- a/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt
+++ b/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt
@@ -191,8 +191,9 @@ class DetailChatRoomFragment : MasterFragment<ChatRoomDetailFragmentBinding, Cha
 
             val localAddress = Factory.instance().createAddress(localSipUri)
             val remoteSipAddress = Factory.instance().createAddress(remoteSipUri)
+            val params: ChatRoomParams? = null
             sharedViewModel.selectedChatRoom.value = coreContext.core.searchChatRoom(
-                null,
+                params,
                 localAddress,
                 remoteSipAddress,
                 arrayOfNulls(
diff --git a/app/src/main/java/org/linphone/activities/main/chat/fragments/MasterChatRoomsFragment.kt b/app/src/main/java/org/linphone/activities/main/chat/fragments/MasterChatRoomsFragment.kt
index e41ff59db..8bf90d21b 100644
--- a/app/src/main/java/org/linphone/activities/main/chat/fragments/MasterChatRoomsFragment.kt
+++ b/app/src/main/java/org/linphone/activities/main/chat/fragments/MasterChatRoomsFragment.kt
@@ -44,6 +44,7 @@ import org.linphone.activities.main.viewmodels.DialogViewModel
 import org.linphone.activities.navigateToChatRoom
 import org.linphone.activities.navigateToChatRoomCreation
 import org.linphone.core.ChatRoom
+import org.linphone.core.ChatRoomParams
 import org.linphone.core.Factory
 import org.linphone.core.tools.Log
 import org.linphone.databinding.ChatRoomMasterFragmentBinding
@@ -324,8 +325,9 @@ class MasterChatRoomsFragment : MasterFragment<ChatRoomMasterFragmentBinding, Ch
             arguments?.clear()
             val localAddress = Factory.instance().createAddress(localSipUri)
             val remoteSipAddress = Factory.instance().createAddress(remoteSipUri)
+            val params: ChatRoomParams? = null
             val chatRoom = coreContext.core.searchChatRoom(
-                null,
+                params,
                 localAddress,
                 remoteSipAddress,
                 arrayOfNulls(0)
diff --git a/app/src/main/java/org/linphone/activities/voip/fragments/ChatFragment.kt b/app/src/main/java/org/linphone/activities/voip/fragments/ChatFragment.kt
index ab9bdf69b..6ac315a32 100644
--- a/app/src/main/java/org/linphone/activities/voip/fragments/ChatFragment.kt
+++ b/app/src/main/java/org/linphone/activities/voip/fragments/ChatFragment.kt
@@ -42,6 +42,7 @@ import org.linphone.activities.main.chat.viewmodels.*
 import org.linphone.activities.main.viewmodels.ListTopBarViewModel
 import org.linphone.compatibility.Compatibility
 import org.linphone.core.ChatRoom
+import org.linphone.core.ChatRoomParams
 import org.linphone.core.Factory
 import org.linphone.core.tools.Log
 import org.linphone.databinding.VoipChatFragmentBinding
@@ -101,8 +102,9 @@ class ChatFragment : GenericFragment<VoipChatFragmentBinding>() {
 
             val localAddress = Factory.instance().createAddress(localSipUri)
             val remoteSipAddress = Factory.instance().createAddress(remoteSipUri)
+            val params: ChatRoomParams? = null
             chatRoom = coreContext.core.searchChatRoom(
-                null,
+                params,
                 localAddress,
                 remoteSipAddress,
                 arrayOfNulls(0)
diff --git a/app/src/main/java/org/linphone/notifications/NotificationBroadcastReceiver.kt b/app/src/main/java/org/linphone/notifications/NotificationBroadcastReceiver.kt
index 6665f3f1c..65c0cd6dc 100644
--- a/app/src/main/java/org/linphone/notifications/NotificationBroadcastReceiver.kt
+++ b/app/src/main/java/org/linphone/notifications/NotificationBroadcastReceiver.kt
@@ -27,6 +27,7 @@ import android.content.Intent
 import org.linphone.LinphoneApplication.Companion.coreContext
 import org.linphone.LinphoneApplication.Companion.ensureCoreExists
 import org.linphone.core.Call
+import org.linphone.core.ChatRoomParams
 import org.linphone.core.Core
 import org.linphone.core.tools.Log
 
@@ -80,7 +81,8 @@ class NotificationBroadcastReceiver : BroadcastReceiver() {
             return
         }
 
-        val room = core.searchChatRoom(null, localAddress, remoteAddress, arrayOfNulls(0))
+        val params: ChatRoomParams? = null
+        val room = core.searchChatRoom(params, localAddress, remoteAddress, arrayOfNulls(0))
         if (room == null) {
             Log.e(
                 "[Notification Broadcast Receiver] Couldn't find chat room for remote address $remoteSipAddress and local address $localIdentity"
diff --git a/app/src/main/java/org/linphone/utils/ActivityMonitor.kt b/app/src/main/java/org/linphone/utils/ActivityMonitor.kt
index 1bdceadc1..15fb8907e 100644
--- a/app/src/main/java/org/linphone/utils/ActivityMonitor.kt
+++ b/app/src/main/java/org/linphone/utils/ActivityMonitor.kt
@@ -23,8 +23,8 @@ import android.app.Activity
 import android.app.Application.ActivityLifecycleCallbacks
 import android.os.Bundle
 import org.linphone.LinphoneApplication.Companion.coreContext
-import org.linphone.core.tools.service.AndroidDispatcher
 import org.linphone.core.tools.AndroidPlatformHelper
+import org.linphone.core.tools.service.AndroidDispatcher
 
 class ActivityMonitor : ActivityLifecycleCallbacks {
     private val activities = ArrayList<Activity>()