diff --git a/src/app/shared/components/address-autocomplete/address-autocomplete.component.ts b/src/app/shared/components/address-autocomplete/address-autocomplete.component.ts
index 7212396ada281ac14a45d4a74e9ab97222c60be0..c0dce3bde1ab8159ffc5f239a98eff8203b1dec2 100644
--- a/src/app/shared/components/address-autocomplete/address-autocomplete.component.ts
+++ b/src/app/shared/components/address-autocomplete/address-autocomplete.component.ts
@@ -20,7 +20,9 @@ export class AddressAutocompleteComponent implements OnInit {
 
   ngOnInit(): void {
     if (this.address) {
-      const address_str = this.address.numero + ' ' + this.address.street + ' ' + this.address.commune;
+      const address_str = this.address.numero
+        ? this.address.numero + ' '
+        : '' + this.address.street + ' ' + this.address.commune;
       this.searchAddress.nativeElement.value = address_str;
     }
   }
@@ -37,7 +39,7 @@ export class AddressAutocompleteComponent implements OnInit {
 
   public selectedResult(hit: any): void {
     const address = new Address();
-    address.numero = hit.properties.housenumber ? hit.properties.housenumber : 0;
+    address.numero = hit.properties.housenumber ? hit.properties.housenumber : null;
     address.street = hit.properties.street;
     address.commune = hit.properties.city;
     const value = this.parseHitToAddress(hit);