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 a1115c3acfb124518e39b3e1a87b538c1a048523..45710320a46494229892ebfe77369aaeaf4ebbd1 100644
--- a/src/app/shared/components/address-autocomplete/address-autocomplete.component.ts
+++ b/src/app/shared/components/address-autocomplete/address-autocomplete.component.ts
@@ -57,9 +57,13 @@ export class AddressAutocompleteComponent implements OnInit {
   public selectedResult(hit: any): void {
     const address = new Address();
     address.numero = hit.properties.housenumber ? hit.properties.housenumber : null;
-    address.street = hit.properties.street;
     address.commune = hit.properties.city;
     address.coordinates = hit.geometry.coordinates;
+    if (hit.properties.street) {
+      address.street = hit.properties.street;
+    } else {
+      address.street = hit.properties.name;
+    }
     const value = this.parseHitToAddress(hit);
     // Set input value
     this.searchAddress.nativeElement.value = value;