diff --git a/scripts/geodata/addresses/components.py b/scripts/geodata/addresses/components.py
index 37f2a88e..64f9469e 100644
--- a/scripts/geodata/addresses/components.py
+++ b/scripts/geodata/addresses/components.py
@@ -322,7 +322,7 @@ class AddressComponents(object):
             component = osm_address_components.component_from_properties(country, props, containing=containing_ids)
             if component is not None:
                 for cn in component_names:
-                    components[cn.lower()].add(normalized_key)
+                    components[cn.lower()].add(component)
 
                 if not is_state:
                     is_state = component == AddressFormatter.STATE