diff --git a/scripts/geodata/openaddresses/formatter.py b/scripts/geodata/openaddresses/formatter.py
index ac839183..beeb495c 100644
--- a/scripts/geodata/openaddresses/formatter.py
+++ b/scripts/geodata/openaddresses/formatter.py
@@ -318,6 +318,9 @@ class OpenAddressesFormatter(object):
                 if key in mapped_values:
                     value = mapped_values[key].get(value, value)
 
+                if key == AddressFormatter.ROAD and language == SPANISH:
+                    value = self.components.spanish_street_name(value)
+
                 if key in AddressFormatter.BOUNDARY_COMPONENTS and key != AddressFormatter.POSTCODE:
                     if add_osm_boundaries:
                         continue
@@ -374,9 +377,6 @@ class OpenAddressesFormatter(object):
                     street = street.strip()
                     street = AddressComponents.cleaned_name(street)
 
-                    if street and language == SPANISH:
-                        street = self.components.spanish_street_name(street)
-
                     if language == UNKNOWN_LANGUAGE:
                         strip_unit_language = candidate_languages[0][0] if candidate_languages else None
                     else: