diff --git a/scripts/geodata/openaddresses/formatter.py b/scripts/geodata/openaddresses/formatter.py
index 897106a1..f87f8a0d 100644
--- a/scripts/geodata/openaddresses/formatter.py
+++ b/scripts/geodata/openaddresses/formatter.py
@@ -169,7 +169,9 @@ class OpenAddressesFormatter(object):
                 if not_applicable_regex.match(value):
                     continue
 
-                components[key] = value.strip(', ')
+                value = value.strip(', ')
+                if value:
+                    components[key] = value
 
             if components:
                 country, candidate_languages, language_props = self.language_rtree.country_and_languages(latitude, longitude)