diff --git a/addons/base_address_extended/models/base_address_extended.py b/addons/base_address_extended/models/base_address_extended.py
index 8e599c08402..566f2cb40f9 100644
--- a/addons/base_address_extended/models/base_address_extended.py
+++ b/addons/base_address_extended/models/base_address_extended.py
@@ -90,9 +90,8 @@ class Partner(models.Model):
         street_fields = self.get_street_fields()
         for partner in self:
             if not partner.street:
-                partner.street_name = ''
-                partner.street_number = ''
-                partner.street_number2 = ''
+                for field in street_fields:
+                    partner[field] = ''
                 continue
 
             street_format = (partner.country_id.street_format or