diff --git a/CHANGELOG.md b/CHANGELOG.md
index 312052a34..1d6f54d26 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Deactivate action buttons and menus if chat room has been left.
 - Display of non-Ascii avatar
 - Remove duplicated nat policies.
+- Remove unadmin feature to self because of not fully supported.
 - Save Stun/Turn proxy configuration.
 - Switch off camera at startup.
 
diff --git a/linphone-app/ui/modules/Linphone/View/ParticipantsListView.qml b/linphone-app/ui/modules/Linphone/View/ParticipantsListView.qml
index d6cfbd9cd..e4ddb39c4 100644
--- a/linphone-app/ui/modules/Linphone/View/ParticipantsListView.qml
+++ b/linphone-app/ui/modules/Linphone/View/ParticipantsListView.qml
@@ -115,7 +115,7 @@ ColumnLayout {
 												  secure:0,
 												  visible:true,
 												  visibleHandler: function(entry){
-													return !UtilsCpp.isMe(entry.sipAddress)
+													return (entry.isMe != undefined && !entry.isMe) || (entry.isMe == undefined && !UtilsCpp.isMe(entry.sipAddress))
 												  },
 												  //: 'Remove this participant from the list' : Tootltip to explain that the action will lead to remove the participant.
 												  tooltipText: qsTr('participantsListRemoveTooltip'),
diff --git a/linphone-app/ui/modules/Linphone/View/ParticipantsView.qml b/linphone-app/ui/modules/Linphone/View/ParticipantsView.qml
index 697114204..da20658ad 100644
--- a/linphone-app/ui/modules/Linphone/View/ParticipantsView.qml
+++ b/linphone-app/ui/modules/Linphone/View/ParticipantsView.qml
@@ -275,7 +275,7 @@ ScrollableListView {
 						width:50
 						indicatorStyle: SwitchStyle.aux
 						
-						visible: sipAddressesView.showSwitch
+						visible: sipAddressesView.showSwitch && !$modelData.isMe
 						
 						enabled:true
 						checked: $modelData.adminStatus
@@ -300,7 +300,6 @@ ScrollableListView {
 								anchors.verticalCenter: parent.verticalCenter
 								tooltipText: modelData.tooltipText? modelData.tooltipText:''
 								visible: sipAddressesView.actions[index].visible && (!sipAddressesView.actions[index].visibleHandler || sipAddressesView.actions[index].visibleHandler(contactView.entry))
-								
 								onClicked: {
 									sipAddressesView.actions[index].handler(contactView.entry)
 								}
diff --git a/linphone-app/ui/views/App/Main/Dialogs/InfoChatRoom.qml b/linphone-app/ui/views/App/Main/Dialogs/InfoChatRoom.qml
index 1097334e2..5e3f4600a 100644
--- a/linphone-app/ui/views/App/Main/Dialogs/InfoChatRoom.qml
+++ b/linphone-app/ui/views/App/Main/Dialogs/InfoChatRoom.qml
@@ -150,16 +150,19 @@ DialogPlus {
 					
 					
 					actions:  dialog.adminMode ? [{
-															 colorSet: InfoChatRoomStyle.removeParticipant,
-															 secure:0,
-															 visible:true,
-															 tooltipText: 'Remove this participant from the selection',
-															 handler: function (entry) {
-																 selectedParticipants.removeModel(entry)
-																 //							++lastContacts.reloadCount
-															 }
-														 }]
-													  : []
+															colorSet: InfoChatRoomStyle.removeParticipant,
+															secure:0,
+															visible:true,
+															visibleHandler: function(entry){
+																return (entry.isMe != undefined && !entry.isMe) || (entry.isMe == undefined && !UtilsCpp.isMe(entry.sipAddress))
+															},
+															tooltipText: 'Remove this participant from the selection',
+															handler: function (entry) {
+																selectedParticipants.removeModel(entry)
+																//							++lastContacts.reloadCount
+															}
+														}]
+													: []
 					
 					genSipAddress: ''