diff --git a/addons/sale/models/sale_order.py b/addons/sale/models/sale_order.py
index 28f79b0c3a9..ba3362fe7fa 100644
--- a/addons/sale/models/sale_order.py
+++ b/addons/sale/models/sale_order.py
@@ -409,7 +409,7 @@ class SaleOrder(models.Model):
     def _compute_team_id(self):
         cached_teams = {}
         for order in self:
-            default_team_id = (order.team_id or order.partner_id.team_id).id
+            default_team_id = self.env.context.get('default_team_id', False) or order.team_id.id or order.partner_id.team_id.id
             user_id = order.user_id.id
             company_id = order.company_id.id
             key = (default_team_id, user_id, company_id)
diff --git a/addons/sales_team/models/crm_team.py b/addons/sales_team/models/crm_team.py
index 756da3846ee..ad28f94ffe2 100644
--- a/addons/sales_team/models/crm_team.py
+++ b/addons/sales_team/models/crm_team.py
@@ -66,6 +66,7 @@ class CrmTeam(models.Model):
                 team = default_team
             else:
                 team = filtered_teams[:1]
+
         # 2- any of my teams
         if not team:
             if default_team and default_team in teams: