diff --git a/digid_eherkenning/models/base.py b/digid_eherkenning/models/base.py
index 3aaa2b8..050a51f 100644
--- a/digid_eherkenning/models/base.py
+++ b/digid_eherkenning/models/base.py
@@ -221,11 +221,7 @@ def process_metadata_from_xml_source(self) -> tuple[dict[str, str], bytes]:
         # sometimes the xml file contains urn instead of a url as an entity ID
         # use the provided url instead
         urls = {
-            "entityId": (
-                entity_id
-                if not (entity_id := idp.get("entityId")).startswith("urn:")
-                else self.metadata_file_source
-            ),
+            "entityId": idp.get("entityId"),
             "sso_url": idp.get("singleSignOnService", {}).get("url"),
             "slo_url": idp.get("singleLogoutService", {}).get("url"),
         }
diff --git a/tests/test_models.py b/tests/test_models.py
index b5c3ed2..41ff0ff 100644
--- a/tests/test_models.py
+++ b/tests/test_models.py
@@ -60,7 +60,7 @@ def test_fields_are_populated_on_eherkennig_save(self, get_matadata):
         )
         self.assertEqual(
             config.idp_service_entity_id,
-            "https://eh01.staging.iwelcome.nl/broker/sso/1.13",
+            "urn:etoegang:HM:00000003520354760000:entities:9632",
         )
 
     @patch(