diff --git a/scripts/geodata/openaddresses/formatter.py b/scripts/geodata/openaddresses/formatter.py
index e725e76c..b4e59dec 100644
--- a/scripts/geodata/openaddresses/formatter.py
+++ b/scripts/geodata/openaddresses/formatter.py
@@ -227,7 +227,7 @@ class OpenAddressesFormatter(object):
                 if address_state:
                     components[AddressFormatter.STATE] = address_state
 
-                if add_osm_boundaries:
+                if add_osm_boundaries or AddressFormatter.CITY not in components:
                     osm_components = self.components.osm_reverse_geocoded_components(latitude, longitude)
                     self.components.add_admin_boundaries(components, osm_components, country, language)
 
diff --git a/scripts/geodata/osm/components.py b/scripts/geodata/osm/components.py
index f8aaaa57..139a8ec7 100644
--- a/scripts/geodata/osm/components.py
+++ b/scripts/geodata/osm/components.py
@@ -40,6 +40,9 @@ class OSMAddressComponents(object):
             'suburb': AddressFormatter.SUBURB,
             'quarter': AddressFormatter.SUBURB,
             'neighbourhood': AddressFormatter.SUBURB
+        },
+        'border_type': {
+            'city': AddressFormatter.CITY
         }
     }