diff --git a/account_payment_partner/tests/test_account_payment_partner.py b/account_payment_partner/tests/test_account_payment_partner.py
index 71d3dbad3..067bc45a8 100644
--- a/account_payment_partner/tests/test_account_payment_partner.py
+++ b/account_payment_partner/tests/test_account_payment_partner.py
@@ -572,15 +572,17 @@ class TestAccountPaymentPartner(TransactionCase):
         move_form = Form(
             self.move_model.with_context(
                 default_name="Invoice test", default_move_type="out_invoice"
-            )
+            ).with_company(self.env.ref("base.main_company").id)
         )
         self.assertFalse(move_form.payment_mode_id)
-        self.env["ir.default"].create(
-            {"field_id": field.id, "json_value": payment_mode.id}
-        )
+        self.env["ir.default"].with_company(
+            self.env.ref("base.main_company").id
+        ).create({"field_id": field.id, "json_value": payment_mode.id})
         move_form = Form(
             self.move_model.with_context(
-                default_name="Invoice test", default_move_type="out_invoice"
-            )
+                default_name="Invoice test",
+                default_move_type="out_invoice",
+                default_company_id=self.env.ref("base.main_company").id,
+            ).with_company(self.env.ref("base.main_company").id)
         )
         self.assertEqual(move_form.payment_mode_id, payment_mode)
diff --git a/account_payment_purchase/models/account_move.py b/account_payment_purchase/models/account_move.py
index c7b24c6ab..3c1504672 100644
--- a/account_payment_purchase/models/account_move.py
+++ b/account_payment_purchase/models/account_move.py
@@ -29,13 +29,13 @@ class AccountMove(models.Model):
                 "message": _("Selected purchase order have different payment mode."),
             }
             return res
-        elif self.payment_mode_id.id != new_mode:
+        elif new_mode and self.payment_mode_id.id != new_mode:
             self.payment_mode_id = new_mode
         if old_bank and new_bank and old_bank != new_bank:
             res["warning"] = {
                 "title": _("Warning"),
                 "message": _("Selected purchase order have different supplier bank."),
             }
-        elif self.partner_bank_id.id != new_bank:
+        elif new_bank and self.partner_bank_id.id != new_bank:
             self.partner_bank_id = new_bank
         return res