diff --git a/src/components/Event/FullAddressAutoComplete.vue b/src/components/Event/FullAddressAutoComplete.vue
index 9bfc60f90..a827684d8 100644
--- a/src/components/Event/FullAddressAutoComplete.vue
+++ b/src/components/Event/FullAddressAutoComplete.vue
@@ -39,7 +39,9 @@
               <o-icon :icon="addressToPoiInfos(option).poiIcon.icon" />
               <b>{{ addressToPoiInfos(option).name }}</b>
             </p>
-            <small>{{ addressToPoiInfos(option).alternativeName }}</small>
+            <p class="text-small">
+              {{ addressToPoiInfos(option).alternativeName }}
+            </p>
           </template>
           <template #empty>
             <template v-if="isFetching">{{ t("Searching…") }}</template>
diff --git a/src/types/address.model.ts b/src/types/address.model.ts
index 580d7fda8..8dadf32f8 100644
--- a/src/types/address.model.ts
+++ b/src/types/address.model.ts
@@ -155,6 +155,7 @@ export function iconForAddress(address: IAddress): IPOIIcon {
 }
 
 export function addressFullName(address: IAddress): string {
+  if (!address) return "";
   const { name, alternativeName } = addressToPoiInfos(address);
   if (name && alternativeName) {
     return `${name}, ${alternativeName}`;