diff --git a/scripts/geodata/addresses/components.py b/scripts/geodata/addresses/components.py
index 828a73ba..88ab1793 100644
--- a/scripts/geodata/addresses/components.py
+++ b/scripts/geodata/addresses/components.py
@@ -962,7 +962,7 @@ class AddressComponents(object):
             key, raw_key = self.pick_random_name_key(neighborhood, neighborhood_level, suffix=language_suffix)
             name = neighborhood.get(key, neighborhood.get(raw_key))
 
-            if place_type == 'borough' or polygon_type == 'local_admin':
+            if place_type == 'borough' or (not place and polygon_type == 'local_admin'):
                 neighborhood_level = AddressFormatter.CITY_DISTRICT
 
                 # Optimization so we don't use e.g. Brooklyn multiple times