diff --git a/scripts/geodata/addresses/components.py b/scripts/geodata/addresses/components.py
index dc56fb5d..191031fc 100644
--- a/scripts/geodata/addresses/components.py
+++ b/scripts/geodata/addresses/components.py
@@ -363,7 +363,10 @@ class AddressComponents(object):
                     for language in languages:
                         abbreviations = state_abbreviations.get_all_abbreviations(country, language, state, default=None)
                         if abbreviations:
-                            names.update([a.lower() for a in abbreviations])
+                            abbrev_names = [a.lower() for a in abbreviations]
+                            names.update(abbrev_names)
+                            for a in abbrev_names:
+                                components[a].add(AddressFormatter.STATE)
 
         return names, components