diff --git a/scripts/geodata/osm/formatter.py b/scripts/geodata/osm/formatter.py
index 61c3f8fd..c0ee290c 100644
--- a/scripts/geodata/osm/formatter.py
+++ b/scripts/geodata/osm/formatter.py
@@ -458,7 +458,8 @@ class OSMAddressFormatter(object):
                 address_components = {component_name: name.strip()}
                 self.components.add_admin_boundaries(address_components, osm_components, country, language,
                                                      non_local_language=language,
-                                                     language_suffix=language_suffix)
+                                                     language_suffix=language_suffix,
+                                                     always_use_full_names=True)
 
                 self.components.normalize_place_names(address_components, osm_components, country=country, languages=set([language]))
                 place_tags.append((address_components, language, False))