diff --git a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomsListViewModel.kt b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomsListViewModel.kt
index 2406fc531..14f943db2 100644
--- a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomsListViewModel.kt
+++ b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomsListViewModel.kt
@@ -55,7 +55,9 @@ class ChatRoomsListViewModel : ErrorReportingViewModel() {
     private val listener: CoreListenerStub = object : CoreListenerStub() {
         override fun onChatRoomStateChanged(core: Core, chatRoom: ChatRoom, state: ChatRoom.State) {
             if (state == ChatRoom.State.Created) {
-                addChatRoom(chatRoom)
+                if (chatRoom in core.chatRooms) { // Don't add empty chat room if 1-1 depending on policy
+                    addChatRoom(chatRoom)
+                }
             } else if (state == ChatRoom.State.TerminationFailed) {
                 Log.e("[Chat Rooms] Group chat room removal for address ${chatRoom.peerAddress.asStringUriOnly()} has failed !")
                 onErrorEvent.value = Event(R.string.chat_room_removal_failed_snack)
@@ -63,11 +65,19 @@ class ChatRoomsListViewModel : ErrorReportingViewModel() {
         }
 
         override fun onMessageSent(core: Core, chatRoom: ChatRoom, message: ChatMessage) {
-            if (findChatRoomIndex(chatRoom) != 0) reorderChatRooms()
+            when (findChatRoomIndex(chatRoom)) {
+                -1 -> addChatRoom(chatRoom)
+                0 -> {}
+                else -> reorderChatRooms()
+            }
         }
 
         override fun onMessageReceived(core: Core, chatRoom: ChatRoom, message: ChatMessage) {
-            if (findChatRoomIndex(chatRoom) != 0) reorderChatRooms()
+            when (findChatRoomIndex(chatRoom)) {
+                -1 -> addChatRoom(chatRoom)
+                0 -> {}
+                else -> reorderChatRooms()
+            }
         }
     }
 
diff --git a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/AudioSettingsViewModel.kt b/app/src/main/java/org/linphone/activities/main/settings/viewmodels/AudioSettingsViewModel.kt
index 3b99f0541..16551c4cb 100644
--- a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/AudioSettingsViewModel.kt
+++ b/app/src/main/java/org/linphone/activities/main/settings/viewmodels/AudioSettingsViewModel.kt
@@ -28,7 +28,6 @@ import org.linphone.core.AudioDevice
 import org.linphone.core.Core
 import org.linphone.core.CoreListenerStub
 import org.linphone.core.EcCalibratorStatus
-import org.linphone.core.tools.Log
 import org.linphone.utils.Event
 import org.linphone.utils.PermissionHelper