diff --git a/src/mod_muc_room.erl b/src/mod_muc_room.erl
index efc2bfc1692..47055bb85f7 100644
--- a/src/mod_muc_room.erl
+++ b/src/mod_muc_room.erl
@@ -3131,6 +3131,9 @@ can_change_ra(owner, _FRole, admin, _TRole, affiliation,
 can_change_ra(owner, _FRole, owner, _TRole, affiliation,
 	      _Affiliation, _ServiceAf) ->
     check_owner;
+can_change_ra(admin, _FRole, admin,
+	      _TRole, affiliation, none, none) ->
+    true; % Allow a admin that joined the room to de-member himself
 can_change_ra(member, participant, member,
 	      participant, affiliation, none, none) ->
     true; % Allow a member that joined the room to de-member himself