diff --git a/scripts/geodata/osm/formatter.py b/scripts/geodata/osm/formatter.py
index 7ad90134..87bb4cd3 100644
--- a/scripts/geodata/osm/formatter.py
+++ b/scripts/geodata/osm/formatter.py
@@ -147,7 +147,7 @@ class OSMAddressFormatter(object):
                 language = random.choice(namespaced)
                 lang_suffix = ':{}'.format(language)
                 for k in tags:
-                    if k.startswith('addr:') and k.endswith(lang_suffix):
+                    if k.endswith(lang_suffix):
                         tags[k.rstrip(lang_suffix)] = tags[k]
 
         return language