diff --git a/addons/crm/models/crm_team_member.py b/addons/crm/models/crm_team_member.py
index 4da8135573c..ddb5c9db0c7 100644
--- a/addons/crm/models/crm_team_member.py
+++ b/addons/crm/models/crm_team_member.py
@@ -19,6 +19,7 @@ class Team(models.Model):
     _inherit = 'crm.team.member'
 
     # assignment
+    assignment_enabled = fields.Boolean(related="crm_team_id.assignment_enabled")
     assignment_domain = fields.Char('Assignment Domain', tracking=True)
     assignment_max = fields.Integer('Max Leads (last 30 days)')
     lead_month_count = fields.Integer(
diff --git a/addons/crm/views/crm_team_member_views.xml b/addons/crm/views/crm_team_member_views.xml
index 07aea21f269..c3ba0dd8305 100644
--- a/addons/crm/views/crm_team_member_views.xml
+++ b/addons/crm/views/crm_team_member_views.xml
@@ -7,6 +7,7 @@
         <field name="inherit_id" ref="sales_team.crm_team_member_view_tree"/>
         <field name="arch" type="xml">
             <field name="user_id" position="after">
+                <field name="assignment_enabled" invisible="1"/>
                 <field name="assignment_max"/>
                 <field name="lead_month_count"/>
             </field>
@@ -19,7 +20,9 @@
         <field name="inherit_id" ref="sales_team.crm_team_member_view_kanban"/>
         <field name="arch" type="xml">
             <xpath expr="//div[hasclass('oe_kanban_details')]" position="after">
-                <div class="o_member_assignment">
+                <field name="assignment_enabled" invisible="1"/>
+                <div class="o_member_assignment"
+                    attrs="{'invisible': [('assignment_enabled', '=', False)]}">
                     <field name="assignment_max" invisible="1"/>
                     <field name="lead_month_count" widget="gauge"
                             options="{'max_field': 'assignment_max'}"/>
@@ -34,7 +37,8 @@
         <field name="inherit_id" ref="sales_team.crm_team_member_view_form"/>
         <field name="arch" type="xml">
             <xpath expr="//group[@name='member_partner_info']" position="after">
-                <group name="group_assign">
+                <group name="group_assign" attrs="{'invisible': [('assignment_enabled', '=', False)]}">
+                    <field name="assignment_enabled" invisible="1"/>
                     <label for="lead_month_count"/>
                     <div>
                         <field name="lead_month_count" class="oe_inline"/>
diff --git a/addons/crm/views/crm_team_views.xml b/addons/crm/views/crm_team_views.xml
index 6bf48cfd16f..9645e465b1d 100644
--- a/addons/crm/views/crm_team_views.xml
+++ b/addons/crm/views/crm_team_views.xml
@@ -111,7 +111,8 @@
                         <button name="action_assign_leads" type="object"
                             string="Assign Leads"
                             class="oe_highlight"
-                            confirm="This will assign leads to all members. Do you want to proceed?"/>
+                            confirm="This will assign leads to all members. Do you want to proceed?"
+                            attrs="{'invisible': [('assignment_enabled', '=', False)]}"/>
                     </header>
                 </xpath>
                 <xpath expr="//div[@name='options_active']" position="inside">
@@ -147,16 +148,27 @@
                 </xpath>
                 <xpath expr="//group[@name='right']" position="attributes">
                     <attribute name="string">Assignment Rules</attribute>
+                    <attribute name="attrs">{'invisible': [('assignment_enabled', '=', False)]}</attribute>
                 </xpath>
                 <xpath expr="//group[@name='right']" position="inside">
+                    <field name="assignment_enabled" invisible="1"/>
+                    <field name="assignment_auto_enabled" invisible="1"/>
                     <field name="assignment_domain" widget="domain" string="Domain"
-                        options="{'model': 'crm.lead', 'in_dialog': True}"/>
-                    <label for="lead_all_assigned_month_count" string="Assigned Leads Count"/>
-                    <div>
+                        options="{'model': 'crm.lead', 'in_dialog': True}"
+                        attrs="{'invisible': [('assignment_enabled', '=', False)]}"/>
+                    <label for="lead_all_assigned_month_count" string="Assigned Leads Count"
+                        attrs="{'invisible': [('assignment_enabled', '=', False)]}"/>
+                    <div attrs="{'invisible': [('assignment_enabled', '=', False)]}">
                         <field name="lead_all_assigned_month_count" class="oe_inline"/> /
                         <field name="assignment_max" class="oe_inline"/>
                     </div>
                 </xpath>
+                <xpath expr="//field[@name='member_ids']" position="attributes">
+                    <attribute name="attrs">{'invisible': [('assignment_enabled', '=', True)]}</attribute>
+                </xpath>
+                <xpath expr="//field[@name='crm_team_member_ids']" position="attributes">
+                    <attribute name="attrs">{'invisible': [('assignment_enabled', '=', False)]}</attribute>
+                </xpath>
             </field>
         </record>
 
diff --git a/addons/sales_team/views/crm_team_views.xml b/addons/sales_team/views/crm_team_views.xml
index 0dfe6ff0944..f959767a54e 100644
--- a/addons/sales_team/views/crm_team_views.xml
+++ b/addons/sales_team/views/crm_team_views.xml
@@ -53,8 +53,7 @@
                     <notebook>
                         <page string="Members" name="members_users">
                             <field name="member_ids" mode="kanban"
-                                class="w-100"
-                                attrs="{'invisible': [('is_membership_multi', '=', True)]}">
+                                class="w-100">
                                 <kanban>
                                     <field name="id"/>
                                     <field name="name"/>
@@ -82,7 +81,7 @@
                             </field>
                             <field name="crm_team_member_ids" mode="kanban"
                                 class="w-100"
-                                attrs="{'invisible': [('is_membership_multi', '=', False)]}"
+                                attrs="{'invisible': ['|', ('is_membership_multi', '=', True), ('is_membership_multi', '=', False)]}"
                                 context="{
                                     'kanban_view_ref': 'sales_team.crm_team_member_view_kanban_from_team',
                                     'form_view_ref': 'sales_team.crm_team_member_view_form_from_team',