diff --git a/addons/account_peppol/models/res_partner.py b/addons/account_peppol/models/res_partner.py
index 3360f992539ac1..a724000d18ac6b 100644
--- a/addons/account_peppol/models/res_partner.py
+++ b/addons/account_peppol/models/res_partner.py
@@ -231,12 +231,20 @@ def create(self, vals_list):
         return res
 
     def _compute_peppol_endpoint(self):
-        partners_to_recompute = self.browse([partner.id for partner in self if partner._origin not in self])
-        super(ResPartner, partners_to_recompute)._compute_peppol_endpoint()
+        partners_to_recompute = self.filtered(
+            lambda p: not p.peppol_endpoint and p.country_id.code in PEPPOL_LIST
+        )
+
+        if partners_to_recompute:
+            super(ResPartner, partners_to_recompute)._compute_peppol_endpoint()
 
     def _compute_peppol_eas(self):
-        partners_to_recompute = self.browse([partner.id for partner in self if partner._origin not in self])
-        super(ResPartner, partners_to_recompute)._compute_peppol_eas()
+        partners_to_recompute = self.filtered(
+            lambda p: not p.peppol_eas and p.country_id.code in PEPPOL_LIST
+        )
+
+        if partners_to_recompute:
+            super(ResPartner, partners_to_recompute)._compute_peppol_eas()
 
     # -------------------------------------------------------------------------
     # BUSINESS ACTIONS
diff --git a/addons/account_peppol/tests/test_peppol_participant.py b/addons/account_peppol/tests/test_peppol_participant.py
index 9d896a950ddc0c..b8ab08c46dbdbc 100644
--- a/addons/account_peppol/tests/test_peppol_participant.py
+++ b/addons/account_peppol/tests/test_peppol_participant.py
@@ -388,3 +388,42 @@ def test_peppol_commercial_entity(self):
             p_rec = partner_form.save()
             self.assertEqual(p_rec.commercial_partner_id, p_rec)
             self.assertEqual(p_rec.commercial_partner_id.name, "test")
+
+    def test_skip_existing_peppol_endpoint(self):
+        country_be = self.env.ref('base.be')
+        partner_to_compute = self.env['res.partner'].create({
+            'name': 'FooToCompute',
+            'country_id': country_be.id,
+            'vat': 'BE0477472701',
+            'peppol_endpoint': False,
+            'peppol_eas': False,
+        })
+
+        custom_endpoint = '0000000001'
+        custom_eas = '0208'
+        partner_already_set = self.env['res.partner'].create({
+            'name': 'FooAlreadySet',
+            'country_id': country_be.id,
+            'vat': 'BE0477472701',
+            'peppol_endpoint': custom_endpoint,
+            'peppol_eas': custom_eas,
+        })
+
+        (partner_to_compute | partner_already_set)._compute_peppol_endpoint()
+        (partner_to_compute | partner_already_set)._compute_peppol_eas()
+
+        self.assertTrue(
+            partner_to_compute.peppol_endpoint,
+            "Endpoint should be computed for partners that don't have it yet.",
+        )
+
+        self.assertEqual(
+            partner_already_set.peppol_endpoint,
+            custom_endpoint,
+            "Existing endpoint should not be overwritten.",
+        )
+        self.assertEqual(
+            partner_already_set.peppol_eas,
+            custom_eas,
+            "Existing EAS should not be overwritten.",
+        )