diff --git a/app/src/main/java/org/linphone/chat/DevicesFragment.java b/app/src/main/java/org/linphone/chat/DevicesFragment.java
index e93aff308..099233730 100644
--- a/app/src/main/java/org/linphone/chat/DevicesFragment.java
+++ b/app/src/main/java/org/linphone/chat/DevicesFragment.java
@@ -142,7 +142,7 @@ public class DevicesFragment extends Fragment {
 
     private void initChatRoom() {
         Core core = LinphoneManager.getLcIfManagerNotDestroyedOrNull();
-        mRoom = core.getChatRoomFromUri(mRoomAddr.asStringUriOnly());
+        mRoom = core.getChatRoom(mRoomAddr, mLocalSipAddr);
     }
 
     private void initHeader() {
diff --git a/app/src/main/java/org/linphone/chat/GroupInfoFragment.java b/app/src/main/java/org/linphone/chat/GroupInfoFragment.java
index 3521e5c92..bc3fc1335 100644
--- a/app/src/main/java/org/linphone/chat/GroupInfoFragment.java
+++ b/app/src/main/java/org/linphone/chat/GroupInfoFragment.java
@@ -162,7 +162,7 @@ public class GroupInfoFragment extends Fragment implements ChatRoomListener {
                             if (LinphoneActivity.instance().isTablet()) {
                                 LinphoneActivity.instance()
                                         .goToChat(
-                                                null,
+                                                mChatRoom.getLocalAddress().asStringUriOnly(),
                                                 mGroupChatRoomAddress.asStringUriOnly(),
                                                 mShareInfos);
                             } else {
@@ -204,7 +204,9 @@ public class GroupInfoFragment extends Fragment implements ChatRoomListener {
                                             mChatRoom.leave();
                                             LinphoneActivity.instance()
                                                     .goToChat(
-                                                            null,
+                                                            mChatRoom
+                                                                    .getLocalAddress()
+                                                                    .asStringUriOnly(),
                                                             mGroupChatRoomAddress.asString(),
                                                             null);
                                         } else {
@@ -398,7 +400,10 @@ public class GroupInfoFragment extends Fragment implements ChatRoomListener {
                             mChatRoom.addParticipants(participantsToAdd);
 
                             LinphoneActivity.instance()
-                                    .goToChat(null, mGroupChatRoomAddress.asString(), null);
+                                    .goToChat(
+                                            mChatRoom.getLocalAddress().asStringUriOnly(),
+                                            mGroupChatRoomAddress.asString(),
+                                            null);
                         }
                     }
                 });