diff --git a/account_payment_partner/models/res_partner.py b/account_payment_partner/models/res_partner.py
index b20ac942d..8f8a93a5c 100644
--- a/account_payment_partner/models/res_partner.py
+++ b/account_payment_partner/models/res_partner.py
@@ -11,13 +11,17 @@ class ResPartner(models.Model):
     supplier_payment_mode_id = fields.Many2one(
         comodel_name="account.payment.mode",
         company_dependent=True,
-        domain="[('payment_type', '=', 'outbound')]",
+        check_company=True,
+        domain="[('payment_type', '=', 'outbound'),"
+        "('company_id', '=', current_company_id)]",
         help="Select the default payment mode for this supplier.",
     )
     customer_payment_mode_id = fields.Many2one(
         comodel_name="account.payment.mode",
         company_dependent=True,
-        domain="[('payment_type', '=', 'inbound')]",
+        check_company=True,
+        domain="[('payment_type', '=', 'inbound'),"
+        "('company_id', '=', current_company_id)]",
         help="Select the default payment mode for this customer.",
     )