diff --git a/scripts/geodata/openaddresses/formatter.py b/scripts/geodata/openaddresses/formatter.py
index 3e134f26..de3e28dd 100644
--- a/scripts/geodata/openaddresses/formatter.py
+++ b/scripts/geodata/openaddresses/formatter.py
@@ -184,6 +184,10 @@ class OpenAddressesFormatter(object):
                     continue
 
                 unit = components.get(AddressFormatter.UNIT, None)
+
+                if unit and street and street.lower() == unit.lower():
+                    continue
+
                 if unit is not None:
                     if is_numeric_strict(unit):
                         unit = Unit.phrase(unit, language, country=country)