diff --git a/scripts/geodata/openaddresses/formatter.py b/scripts/geodata/openaddresses/formatter.py
index e55be693..f54034eb 100644
--- a/scripts/geodata/openaddresses/formatter.py
+++ b/scripts/geodata/openaddresses/formatter.py
@@ -385,7 +385,10 @@ class OpenAddressesFormatter(object):
                         if postcode_length:
                             postcode = postcode.zfill(postcode_length)[:postcode_length]
 
+                    if postcode:
                         components[AddressFormatter.POSTCODE] = postcode
+                    elif AddressFormatter.POSTCODE in components:
+                        component.pop(AddressFormatter.POSTCODE)
 
                 unit = components.get(AddressFormatter.UNIT, None)