diff --git a/scripts/geodata/addresses/components.py b/scripts/geodata/addresses/components.py
index b8eeb6c0..ea0c9281 100644
--- a/scripts/geodata/addresses/components.py
+++ b/scripts/geodata/addresses/components.py
@@ -1023,7 +1023,8 @@ class AddressComponents(object):
 
             # For cases like OpenAddresses
             if replace_city and city_name and (name.lower() == city_name.lower() or standard_name.lower() == city_name.lower()):
-                address_components.pop(AddressFormatter.CITY)
+                address_components.pop(AddressFormatter.CITY, None)
+                city_name = None
                 address_components[neighborhood_level] = name
 
             neighborhood_levels[neighborhood_level].append(name)