diff --git a/l10n_br_base/data/res_country_data.xml b/l10n_br_base/data/res_country_data.xml
index 7a13705143f5..088ff984f992 100644
--- a/l10n_br_base/data/res_country_data.xml
+++ b/l10n_br_base/data/res_country_data.xml
@@ -145,13 +145,12 @@
         <field name="bc_code">1058</field>
         <field name="siscomex_code">105</field>
         <field name="enforce_cities">1</field>
-        <field name="street_format" eval="'%(street_name)s, %(street_number)s'" />
         <field name="name_position">before</field>
         <field
             name="address_format"
             eval="'%(street)s %(street2)s\n%(district)s\n%(zip)s - %(city)s-%(state_code)s\n%(country_name)s'"
         />
-        <field name="address_view_id" ref="l10n_br_base_res_partner_address" />
+        <!-- <field name="address_view_id" ref="l10n_br_base_res_partner_address" /> -->
         <field name="vat_label">CNPJ/CPF</field>
     </record>
 
diff --git a/l10n_br_base/models/res_partner.py b/l10n_br_base/models/res_partner.py
index 957468b06177..7a6a0536134e 100644
--- a/l10n_br_base/models/res_partner.py
+++ b/l10n_br_base/models/res_partner.py
@@ -20,6 +20,16 @@ class Partner(models.Model):
     _name = "res.partner"
     _inherit = [_name, "l10n_br_base.party.mixin"]
 
+    def _inverse_street_data(self):
+        """update self.street based on street_name, street_number and street_number2"""
+        for partner in self:
+            street = (
+                (partner.street_name or "") + ", " + (partner.street_number or "")
+            ).strip()
+            if partner.street_number2:
+                street = street + " - " + partner.street_number2
+            partner.street = street
+
     vat = fields.Char(related="cnpj_cpf")
 
     is_accountant = fields.Boolean(string="Is accountant?")