diff --git a/scripts/geodata/openaddresses/formatter.py b/scripts/geodata/openaddresses/formatter.py
index de3e28dd..e725e76c 100644
--- a/scripts/geodata/openaddresses/formatter.py
+++ b/scripts/geodata/openaddresses/formatter.py
@@ -157,6 +157,9 @@ class OpenAddressesFormatter(object):
                 if validator is not None and not validator(value):
                     continue
 
+                if key in AddressFormatter.BOUNDARY_COMPONENTS:
+                    value = self.components.cleaned_name(value, first_comma_delimited_phrase=True)
+
                 components[key] = value.strip(', ')
 
             if components: