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 2de1ade44..5b1ec0b82 100644
--- a/app/src/main/java/org/linphone/activities/main/MainActivity.kt
+++ b/app/src/main/java/org/linphone/activities/main/MainActivity.kt
@@ -307,7 +307,7 @@ class MainActivity : GenericActivity(), SnackBarActivity, NavController.OnDestin
                             "linphone-android://chat-room/$localAddress/$peerAddress"
                         } else {
                             Log.i("[Main Activity] Found chat intent extra, go to chat rooms list")
-                            "linphone-android://chat/"
+                            "linphone-android://chat-room/"
                         }
                         findNavController(R.id.nav_host_fragment).navigate(Uri.parse(deepLink))
                     }
@@ -451,7 +451,7 @@ class MainActivity : GenericActivity(), SnackBarActivity, NavController.OnDestin
                 Log.i("[Main Activity] Found shortcut ID: $shortcutId")
                 handleLocusOrShortcut(shortcutId)
             } else {
-                val deepLink = "linphone-android://chat/"
+                val deepLink = "linphone-android://chat-room/"
                 Log.i("[Main Activity] Starting deep link: $deepLink")
                 findNavController(R.id.nav_host_fragment).navigate(Uri.parse(deepLink))
             }
diff --git a/app/src/main/res/navigation/main_nav_graph.xml b/app/src/main/res/navigation/main_nav_graph.xml
index 9e6204476..3f6f05195 100644
--- a/app/src/main/res/navigation/main_nav_graph.xml
+++ b/app/src/main/res/navigation/main_nav_graph.xml
@@ -22,15 +22,13 @@
         <argument
             android:name="LocalSipUri"
             app:argType="string"
+            android:defaultValue="@null"
             app:nullable="true" />
         <argument
             android:name="RemoteSipUri"
             app:argType="string"
+            android:defaultValue="@null"
             app:nullable="true" />
-        <deepLink
-            android:id="@+id/chatsDeepLink"
-            app:uri="linphone-android://chat/"
-            android:autoVerify="true" />
         <deepLink
             android:id="@+id/chatRoomDeepLink"
             app:uri="linphone-android://chat-room/{LocalSipUri}/{RemoteSipUri}"
@@ -53,10 +51,6 @@
         <action
             android:id="@+id/action_masterContactsFragment_to_masterChatRoomsFragment"
             app:destination="@id/masterChatRoomsFragment" />
-        <argument
-            android:name="id"
-            app:argType="string"
-            app:nullable="true" />
         <deepLink
             android:id="@+id/contactDeepLink"
             app:uri="linphone-android://contact/view/{id}"