diff --git a/addons/account/models/partner.py b/addons/account/models/partner.py
index 8a7d758db37..d0cce28887a 100644
--- a/addons/account/models/partner.py
+++ b/addons/account/models/partner.py
@@ -881,9 +881,13 @@ class ResPartner(models.Model):
             return self.env['res.partner'].search(domain + extra_domain, limit=1)
 
         for search_method in (search_with_vat, search_with_domain, search_with_phone_mail, search_with_name):
-            partner = search_method(self.env['res.partner']._check_company_domain(company or self.env.company))
-            if partner and len(partner) == 1:
-                return partner
+            for extra_domain in (
+                [*self.env['res.partner']._check_company_domain(company or self.env.company), ('company_id', '!=', False)],
+                [('company_id', '=', False)],
+            ):
+                partner = search_method(extra_domain)
+                if partner and len(partner) == 1:
+                    return partner
         return self.env['res.partner']
 
     def _merge_method(self, destination, source):