diff --git a/addons/account/models/partner.py b/addons/account/models/partner.py
index e0c8dac8373..337797b2d1c 100644
--- a/addons/account/models/partner.py
+++ b/addons/account/models/partner.py
@@ -123,6 +123,8 @@ class AccountFiscalPosition(models.Model):
         if not country_id:
             return False
         base_domain = [('auto_apply', '=', True), ('vat_required', '=', vat_required)]
+        if self.env.context.get('force_company'):
+            base_domain.append(('company_id', '=', self.env.context.get('force_company')))
         null_state_dom = state_domain = [('state_ids', '=', False)]
         null_zip_dom = zip_domain = [('zip_from', '=', 0), ('zip_to', '=', 0)]
         null_country_dom = [('country_id', '=', False), ('country_group_id', '=', False)]