diff --git a/src/app/constant/JamiStrings.qml b/src/app/constant/JamiStrings.qml
index b6c8bfe1df51f12bf218121243732343ca996f31..a134d841be0fdc44d06698c3c520ac463c50f9c7 100644
--- a/src/app/constant/JamiStrings.qml
+++ b/src/app/constant/JamiStrings.qml
@@ -852,8 +852,6 @@ Item {
     property string none: qsTr("None")
 
     // NewSwarmPage
-    property string youCanAdd7: qsTr("You can add 7 people in the swarm")
-    property string youCanAddMore: qsTr("You can add %1 more people in the swarm")
     property string createTheSwarm: qsTr("Create the swarm")
     property string goToConversation: qsTr("Go to conversation")
     property string promoteAdministrator: qsTr("Promote to administrator")
diff --git a/src/app/contactadapter.cpp b/src/app/contactadapter.cpp
index 2eec2f096b7077c6806e38a2a546698ce9c6feef..b52c6f2782b416d70a1d12af30c77ea6487b612d 100644
--- a/src/app/contactadapter.cpp
+++ b/src/app/contactadapter.cpp
@@ -154,12 +154,9 @@ ContactAdapter::contactSelected(int index)
         switch (listModeltype_) {
         case SmartListModel::Type::ADDCONVMEMBER: {
             auto members = convModel->peersForConversation(lrcInstance_->get_selectedConvUid());
-            auto cntMembers = members.size();
             const auto uris = contactIndex.data(Role::Uris).toStringList();
             for (const auto& uri : uris) {
-                // TODO remove < 9
-                if (!members.contains(uri) && cntMembers < 9) {
-                    cntMembers++;
+                if (!members.contains(uri)) {
                     convModel->addConversationMember(lrcInstance_->get_selectedConvUid(), uri);
                 }
             }
diff --git a/src/app/mainview/components/ChatViewHeader.qml b/src/app/mainview/components/ChatViewHeader.qml
index a7cadb83aa67aefb1368a12f738e3a9ae644a5bd..b95fb641744bdbb266a1f328e0ec8b5b97726cf1 100644
--- a/src/app/mainview/components/ChatViewHeader.qml
+++ b/src/app/mainview/components/ChatViewHeader.qml
@@ -207,7 +207,7 @@ Rectangle {
                 normalColor: JamiTheme.chatviewBgColor
                 imageColor: JamiTheme.chatviewButtonColor
 
-                visible: interactionButtonsVisibility && CurrentConversationMembers.count < 8 && addMemberVisibility
+                visible: interactionButtonsVisibility && addMemberVisibility
 
                 onClicked: addToConversationClicked()
             }
diff --git a/src/app/mainview/components/SidePanel.qml b/src/app/mainview/components/SidePanel.qml
index 768a363728dd49d6cdc7ff501b9b508a24314fb4..cd5b6166d467da3e100363acaa188c80a25b6377 100644
--- a/src/app/mainview/components/SidePanel.qml
+++ b/src/app/mainview/components/SidePanel.qml
@@ -131,11 +131,6 @@ SidePanelBase {
             newHm = Array.from(newHm).filter(r => r.convId !== convId)
         }
 
-        // We can't have more than 8 participants yet. (7 + self)
-        if (newHm.length > 7) {
-            return false
-        }
-
         newH.push(convId)
         root.highlighted = newH
         root.highlightedMembers = newHm
@@ -397,25 +392,6 @@ SidePanelBase {
 
                 spacing: 4
 
-                Text {
-                    font.bold: true
-                    font.pointSize: JamiTheme.contactEventPointSize
-
-                    Layout.margins: 16
-                    Layout.maximumHeight: 24
-                    Layout.alignment: Qt.AlignTop
-                    Layout.fillWidth: true
-
-                    wrapMode: Text.Wrap
-
-                    text: {
-                        if (highlightedMembers.length === 0)
-                            return JamiStrings.youCanAdd7
-                        return JamiStrings.youCanAddMore.arg(7 - Math.min(highlightedMembers.length, 7))
-                    }
-                    color: JamiTheme.textColor
-                }
-
                 JamiListView {
                     id: swarmCurrentConversationList