diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
index edd089950..6fa12c1dc 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
@@ -16,8 +16,6 @@
 </template>
 
 <script>
-import { mapState } from 'vuex';
-
 import AddAddress from '../_components/AddAddress.vue';
 
 export default {
@@ -36,9 +34,9 @@ export default {
 
          let newAddress = {
             'isNoAddress': address.isNoAddress,
-            'street': address.street,
-            'streetNumber': address.streetNumber,
-            'postcode': {'id': address.selected.city.id },
+            'street': address.isNoAddress ? '' : address.street,
+            'streetNumber': address.isNoAddress ? '' : address.streetNumber,
+            'postcode': {'id': address.selected.city.id},
             'floor': address.floor,
             'corridor': address.corridor,
             'steps': address.steps,
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_api/AddAddress.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_api/AddAddress.js
index 9b9619331..160ca9291 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_api/AddAddress.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_api/AddAddress.js
@@ -73,7 +73,7 @@ const postAddress = (address) => {
       method: 'POST',
       headers: {
          'Content-Type': 'application/json;charset=utf-8'
-         },
+      },
       body: JSON.stringify(body)
    }).then(response => {
       if (response.ok) { return response.json(); }
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress.vue
index 7e5fb69e0..802200c3e 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddAddress.vue
@@ -42,6 +42,7 @@
                      </city-selection>
 
                      <address-selection
+                        v-if="!isNoAddress"
                         v-bind:address="address"
                         v-bind:updateMapCenter="updateMapCenter">
                      </address-selection>
@@ -206,6 +207,7 @@ export default {
          this.address.loaded.cities = [];
          this.address.selected.city = {};
          this.address.selected.country = {};
+         this.address.isNoAddress = false;
          this.address.street = null;
          this.address.streetNumber = null;
          this.address.floor = null;
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/App.vue
index b3c26f23c..b507a6473 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdAddress/App.vue
@@ -72,9 +72,9 @@ export default {
 
          let createdAddress = {
             'isNoAddress': address.isNoAddress,
-            'street': address.street,
-            'streetNumber': address.streetNumber,
-            'postcode': {'id': address.selected.city.id },
+            'street': address.isNoAddress ? '' : address.street,
+            'streetNumber': address.isNoAddress ? '' : address.streetNumber,
+            'postcode': {'id': address.selected.city.id},
             'floor': address.floor,
             'corridor': address.corridor,
             'steps': address.steps,