diff --git a/app/src/main/java/org/linphone/activities/main/MainActivity.kt b/app/src/main/java/org/linphone/activities/main/MainActivity.kt
index 619b2bfff..bdaf74447 100644
--- a/app/src/main/java/org/linphone/activities/main/MainActivity.kt
+++ b/app/src/main/java/org/linphone/activities/main/MainActivity.kt
@@ -454,6 +454,7 @@ class MainActivity : GenericActivity(), SnackBarActivity, NavController.OnDestin
             findNavController(R.id.nav_host_fragment).navigate(Uri.parse(deepLink))
         } else {
             Log.e("[Main Activity] Failed to parse shortcut/locus id: $id")
+            findNavController(R.id.nav_host_fragment).navigate(R.id.action_global_masterChatRoomsFragment)
         }
     }
 
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 3a05b5ff5..b7cfa67ab 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
@@ -318,6 +318,8 @@ class DetailChatRoomFragment : MasterFragment<ChatRoomDetailFragmentBinding, Cha
                     if (sharedViewModel.isSlidingPaneSlideable.value == true) {
                         Log.i("[Chat Room] Forwarding message, going to chat rooms list")
                         sharedViewModel.closeSlidingPaneEvent.value = Event(true)
+                    } else {
+                        navigateToEmptyChatRoom()
                     }
                 }
             }
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 67d28bf17..1ab6aa80d 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
@@ -148,11 +148,7 @@ class MasterChatRoomsFragment : MasterFragment<ChatRoomMasterFragmentBinding, Ch
         binding.slidingPane.addPanelSlideListener(object : SlidingPaneLayout.PanelSlideListener {
             override fun onPanelSlide(panel: View, slideOffset: Float) { }
 
-            override fun onPanelOpened(panel: View) {
-                /* if (binding.slidingPane.isSlideable) {
-                    (requireActivity() as MainActivity).hideTabsFragment()
-                } */
-            }
+            override fun onPanelOpened(panel: View) { }
 
             override fun onPanelClosed(panel: View) {
                 if (binding.slidingPane.isSlideable) {
@@ -326,6 +322,7 @@ class MasterChatRoomsFragment : MasterFragment<ChatRoomMasterFragmentBinding, Ch
                         // val activity = requireActivity() as MainActivity
                         // activity.showSnackBar(R.string.chat_room_toast_choose_for_sharing)
                         listViewModel.textSharingPending.value = true
+                        clearDisplayedChatRoom()
                     } else {
                         if (sharedViewModel.filesToShare.value.isNullOrEmpty()) {
                             listViewModel.textSharingPending.value = false
@@ -341,6 +338,7 @@ class MasterChatRoomsFragment : MasterFragment<ChatRoomMasterFragmentBinding, Ch
                         // val activity = requireActivity() as MainActivity
                         // activity.showSnackBar(R.string.chat_room_toast_choose_for_sharing)
                         listViewModel.fileSharingPending.value = true
+                        clearDisplayedChatRoom()
                     } else {
                         if (sharedViewModel.textToShare.value.isNullOrEmpty()) {
                             listViewModel.fileSharingPending.value = false
diff --git a/app/src/main/java/org/linphone/compatibility/Api29Compatibility.kt b/app/src/main/java/org/linphone/compatibility/Api29Compatibility.kt
index fbdad96b2..9ffd1e3ea 100644
--- a/app/src/main/java/org/linphone/compatibility/Api29Compatibility.kt
+++ b/app/src/main/java/org/linphone/compatibility/Api29Compatibility.kt
@@ -86,9 +86,7 @@ class Api29Compatibility {
         fun setLocusIdInContentCaptureSession(root: View, chatRoom: ChatRoom) {
             val session: ContentCaptureSession? = root.contentCaptureSession
             if (session != null) {
-                val localAddress = chatRoom.localAddress.asStringUriOnly()
-                val peerAddress = chatRoom.peerAddress.asStringUriOnly()
-                val id = LinphoneUtils.getChatRoomId(localAddress, peerAddress)
+                val id = LinphoneUtils.getChatRoomId(chatRoom.localAddress, chatRoom.peerAddress)
                 session.contentCaptureContext = ContentCaptureContext.forLocusId(id)
             }
         }
diff --git a/app/src/main/java/org/linphone/compatibility/Api30Compatibility.kt b/app/src/main/java/org/linphone/compatibility/Api30Compatibility.kt
index d785cbea8..dcf7d050b 100644
--- a/app/src/main/java/org/linphone/compatibility/Api30Compatibility.kt
+++ b/app/src/main/java/org/linphone/compatibility/Api30Compatibility.kt
@@ -46,11 +46,8 @@ class Api30Compatibility {
         }
 
         fun removeChatRoomShortcut(context: Context, chatRoom: ChatRoom) {
-            val peerAddress = chatRoom.peerAddress.asStringUriOnly()
-            val localAddress = chatRoom.localAddress.asStringUriOnly()
-
             val shortcutManager = context.getSystemService(ShortcutManager::class.java)
-            val id = LinphoneUtils.getChatRoomId(localAddress, peerAddress)
+            val id = LinphoneUtils.getChatRoomId(chatRoom.localAddress, chatRoom.peerAddress)
             val shortcutsToRemoveList = arrayListOf(id)
             shortcutManager.removeLongLivedShortcuts(shortcutsToRemoveList)
         }
diff --git a/app/src/main/java/org/linphone/notifications/NotificationsManager.kt b/app/src/main/java/org/linphone/notifications/NotificationsManager.kt
index 39c2cb6ed..28c26b141 100644
--- a/app/src/main/java/org/linphone/notifications/NotificationsManager.kt
+++ b/app/src/main/java/org/linphone/notifications/NotificationsManager.kt
@@ -636,7 +636,7 @@ class NotificationsManager(private val context: Context) {
             PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_MUTABLE
         )
 
-        val id = LinphoneUtils.getChatRoomId(localAddress, peerAddress)
+        val id = LinphoneUtils.getChatRoomId(room.localAddress, room.peerAddress)
         val notification = createMessageNotification(notifiable, pendingIntent, bubbleIntent, id)
         notify(notifiable.notificationId, notification)
     }
diff --git a/app/src/main/java/org/linphone/utils/LinphoneUtils.kt b/app/src/main/java/org/linphone/utils/LinphoneUtils.kt
index 3607f238a..e939a085d 100644
--- a/app/src/main/java/org/linphone/utils/LinphoneUtils.kt
+++ b/app/src/main/java/org/linphone/utils/LinphoneUtils.kt
@@ -162,8 +162,12 @@ class LinphoneUtils {
                 )
         }
 
-        fun getChatRoomId(localAddress: String, remoteAddress: String): String {
-            return "$localAddress~$remoteAddress"
+        fun getChatRoomId(localAddress: Address, remoteAddress: Address): String {
+            val localSipUri = localAddress.clone()
+            localSipUri.clean()
+            val remoteSipUri = remoteAddress.clone()
+            remoteSipUri.clean()
+            return "${localSipUri.asStringUriOnly()}~${remoteSipUri.asStringUriOnly()}"
         }
     }
 }
diff --git a/app/src/main/java/org/linphone/utils/ShortcutsHelper.kt b/app/src/main/java/org/linphone/utils/ShortcutsHelper.kt
index 51e7cbc37..c02c25fed 100644
--- a/app/src/main/java/org/linphone/utils/ShortcutsHelper.kt
+++ b/app/src/main/java/org/linphone/utils/ShortcutsHelper.kt
@@ -151,9 +151,9 @@ class ShortcutsHelper(val context: Context) {
         }
 
         private fun createChatRoomShortcut(context: Context, chatRoom: ChatRoom): ShortcutInfo? {
-            val peerAddress = chatRoom.peerAddress.asStringUriOnly()
             val localAddress = chatRoom.localAddress.asStringUriOnly()
-            val id = LinphoneUtils.getChatRoomId(localAddress, peerAddress)
+            val peerAddress = chatRoom.peerAddress.asStringUriOnly()
+            val id = LinphoneUtils.getChatRoomId(chatRoom.localAddress, chatRoom.peerAddress)
 
             try {
                 val categories: ArraySet<String> = ArraySet()