diff --git a/wis2box-management/wis2box/metadata/discovery.py b/wis2box-management/wis2box/metadata/discovery.py
index 87f830a7..19ff683a 100644
--- a/wis2box-management/wis2box/metadata/discovery.py
+++ b/wis2box-management/wis2box/metadata/discovery.py
@@ -90,9 +90,6 @@ def generate(self, mcf: dict) -> str:
         if record['properties']['contacts'][0].get('organization') is None:
             record['properties']['contacts'][0]['organization'] = record['properties']['contacts'][0].pop('name', "NOTSET")  # noqa
 
-        if 'language' in record['properties']:
-            _ = record['properties'].pop('language')
-
         try:
             phone = record['properties']['contacts'][0]['phones'][0]['value']
             if isinstance(phone, int):
@@ -253,6 +250,9 @@ def publish_discovery_metadata(metadata: Union[dict, str]):
             record_mcf = dm.parse_record(metadata)
             record = dm.generate(record_mcf)
 
+        if 'language' in record['properties']:
+            _ = record['properties'].pop('language')
+        
         distribution_links = dm.get_distribution_links(record, format_='wcmp2')
         # update links, do not extend or we get duplicates
         record['links'] = distribution_links