diff --git a/addons/crm/models/crm_team_member.py b/addons/crm/models/crm_team_member.py
index e1776761c85..edb0fc041c2 100644
--- a/addons/crm/models/crm_team_member.py
+++ b/addons/crm/models/crm_team_member.py
@@ -21,7 +21,7 @@ class Team(models.Model):
     # 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)')
+    assignment_max = fields.Integer('Max Leads (last 30 days)', default=30)
     lead_month_count = fields.Integer(
         'Leads (30 days)', compute='_compute_lead_month_count',
         help='Lead assigned to this member those last 30 days')
diff --git a/addons/crm/views/crm_team_member_views.xml b/addons/crm/views/crm_team_member_views.xml
index c3ba0dd8305..2abce300dd4 100644
--- a/addons/crm/views/crm_team_member_views.xml
+++ b/addons/crm/views/crm_team_member_views.xml
@@ -25,7 +25,8 @@
                     attrs="{'invisible': [('assignment_enabled', '=', False)]}">
                     <field name="assignment_max" invisible="1"/>
                     <field name="lead_month_count" widget="gauge"
-                            options="{'max_field': 'assignment_max'}"/>
+                        options="{'max_field': 'assignment_max'}"
+                        attrs="{'invisible': [('assignment_max', '=', 0)]}"/>
                 </div>
             </xpath>
         </field>
@@ -47,7 +48,8 @@
                         <span class="oe_inline"> (max) </span>
                     </div>
                     <field name="assignment_domain" string="Domain" widget="domain"
-                        options="{'model': 'crm.lead'}"/>
+                        options="{'model': 'crm.lead'}"
+                        attrs="{'invisible': [('assignment_max', '=', 0)]}"/>
                 </group>
             </xpath>
         </field>