diff --git a/src/Bundle/ChillMainBundle/Entity/Address.php b/src/Bundle/ChillMainBundle/Entity/Address.php
index 8eac6668b..10679d2e0 100644
--- a/src/Bundle/ChillMainBundle/Entity/Address.php
+++ b/src/Bundle/ChillMainBundle/Entity/Address.php
@@ -480,8 +480,11 @@ class Address
         return $this;
     }
 
-    public function setStreet(string $street): self
+    public function setStreet(?string $street): self
     {
+        if (null === $street) {
+            $street = '';
+        }
         $this->street = $street;
 
         return $this;
@@ -515,8 +518,11 @@ class Address
         return $this;
     }
 
-    public function setStreetNumber(string $streetNumber): self
+    public function setStreetNumber(?string $streetNumber): self
     {
+        if (null === $streetNumber) {
+            $streetNumber = '';
+        }
         $this->streetNumber = $streetNumber;
 
         return $this;
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_valid_from_edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_valid_from_edit.html.twig
index 78c7b0fe1..9f0a438fb 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/address_valid_from_edit.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/address_valid_from_edit.html.twig
@@ -20,7 +20,13 @@
         {% endif %}
     </div>
     <div hidden>
-        {{ form_rest(form) }}
+        {% if address.isNoAddress %}
+            {{ form_row(form.street, {'value': ' '})}}
+            {{ form_row(form.streetNumber, {'value': ' '})}}
+            {{ form_row(form.postCode)}}
+        {% else %}
+            {{ form_rest(form) }}
+        {% endif %}
     </div>
 
     <ul class="record_actions sticky-form-buttons">