diff --git a/protocol/messenger_communities.go b/protocol/messenger_communities.go
index d7d461eef..7d1b72de9 100644
--- a/protocol/messenger_communities.go
+++ b/protocol/messenger_communities.go
@@ -1762,7 +1762,6 @@ func (m *Messenger) RemoveUserFromCommunity(id types.HexBytes, pkString string)
 	return response, nil
 }
 
-// TODO
 func (m *Messenger) SendKeyExchangeMessage(communityID []byte, pubkeys []*ecdsa.PublicKey, msgType common.CommKeyExMsgType) error {
 	rawMessage := common.RawMessage{
 		SkipEncryption:        false,
@@ -1796,10 +1795,11 @@ func (m *Messenger) BanUserFromCommunity(request *requests.BanUserFromCommunity)
 		return nil, err
 	}
 
-	// TODO generate new encryption key
-	err = m.SendKeyExchangeMessage(community.ID(), community.GetMemberPubkeys(), common.KeyExMsgRekey)
-	if err != nil {
-		return nil, err
+	if community.Encrypted() {
+		err = m.SendKeyExchangeMessage(community.ID(), community.GetMemberPubkeys(), common.KeyExMsgRekey)
+		if err != nil {
+			return nil, err
+		}
 	}
 
 	response := &MessengerResponse{}
@@ -3820,8 +3820,6 @@ func (m *Messenger) UpdateCommunityEncryption(community *communities.Community)
 	becomeMemberPermissions := community.TokenPermissionsByType(protobuf.CommunityTokenPermission_BECOME_MEMBER)
 	isEncrypted := len(becomeMemberPermissions) > 0
 
-	// Check isEncrypted is different to Community's value
-	// If not different return
 	if community.Encrypted() == isEncrypted {
 		return nil, nil
 	}