diff --git a/app/src/main/java/org/linphone/ui/call/model/ConferenceModel.kt b/app/src/main/java/org/linphone/ui/call/model/ConferenceModel.kt
index d38fe5df1..ed435d735 100644
--- a/app/src/main/java/org/linphone/ui/call/model/ConferenceModel.kt
+++ b/app/src/main/java/org/linphone/ui/call/model/ConferenceModel.kt
@@ -261,10 +261,6 @@ class ConferenceModel {
         val conferenceParticipants = conference.participantList
         Log.i("$TAG [${conferenceParticipants.size}] participant in conference")
 
-        val meParticipant = conference.me
-        val meParticipantModel = ConferenceParticipantModel(meParticipant)
-        participantsList.add(meParticipantModel)
-
         for (participant in conferenceParticipants) {
             val devices = participant.devices
             val role = participant.role
@@ -288,6 +284,10 @@ class ConferenceModel {
             "$TAG [${devicesList.size}] participant devices for [${participantsList.size}] participants will be displayed (not counting ourselves)"
         )
 
+        val meParticipant = conference.me
+        val meParticipantModel = ConferenceParticipantModel(meParticipant)
+        participantsList.add(meParticipantModel)
+
         val ourDevices = conference.me.devices
         Log.i("$TAG We have [${ourDevices.size}] devices")
         for (device in ourDevices) {
diff --git a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationInfoViewModel.kt b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationInfoViewModel.kt
index cc919ffc1..1da2abb3a 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationInfoViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationInfoViewModel.kt
@@ -535,6 +535,22 @@ class ConversationInfoViewModel @UiThread constructor() : ViewModel() {
                 friends.add(model.avatarModel.friend)
                 participantsList.add(model)
             }
+
+            // Add ourselves at the end of the list
+            val meParticipant = chatRoom.me
+            if (meParticipant != null) {
+                val model = ParticipantModel(
+                    meParticipant.address,
+                    selfAdmin,
+                    isParticipantAdmin = selfAdmin,
+                    showMenu = false,
+                    onMenuClicked = { view, model ->
+                        // openMenu
+                        showParticipantAdminPopupMenuEvent.postValue(Event(Pair(view, model)))
+                    }
+                )
+                participantsList.add(model)
+            }
         }
 
         val avatar = if (groupChatRoom) {