diff --git a/models/res_partner.py b/models/res_partner.py
index 79f156bfcca058642ba25a3f7debf8ac708b50af..8a6d79a35a571c12c0af8936a40fc37bfe3d523b 100644
--- a/models/res_partner.py
+++ b/models/res_partner.py
@@ -122,7 +122,7 @@ class ResPartner(models.Model):
     # ------------------------------------------------------
     @api.model
     def _get_default_address_format_simple(self):
-        return "%(street)s\n%(street2)s\n%(street3)s\n%(city)s %(zip)s\n"
+        return "%(street)s\n%(street2)s\n%(street3)s\n%(city)s %(zip)s"
 
     @api.model
     def _get_address_format_simple(self):
@@ -139,7 +139,10 @@ class ResPartner(models.Model):
         })
         for field in self._formatting_address_fields():
             args[field] = getattr(self, field) or ''
-        return address_format % args
+        res = address_format % args
+        while "\n\n" in res:
+            res = res.replace("\n\n", "\n")
+        return res.lstrip()
 
     @api.depends("child_ids", "child_ids.is_legal_representative")
     def _compute_legal_representative(self):