diff --git a/src/app/pages/contacts/contacts-list/contacts-list-column-definition.ts b/src/app/pages/contacts/contacts-list/contacts-list-column-definition.ts
index 327aeab..5b4a5f4 100644
--- a/src/app/pages/contacts/contacts-list/contacts-list-column-definition.ts
+++ b/src/app/pages/contacts/contacts-list/contacts-list-column-definition.ts
@@ -61,11 +61,12 @@
   },
   {
     valueGetter: function(params) {
-      if (params.data.community || params.data.street || params.data.housenumber) {
-        return `${params.data.community}, ${params.data.street} ${params.data.housenumber}`;
-      } else {
-        return '';
-      }
+      let result = '';
+      if (params.data.community) result += `${params.data.community}`;
+      if (params.data.street) result += ',' + ` ${params.data.street}`;
+      if (params.data.housenumber) result += ` ${params.data.housenumber}`;
+
+      return result;
     },
     colId: 'mainaddress',
     headerName: 'Contacts.MainAddress',