diff --git a/src/components/Event/FullAddressAutoComplete.vue b/src/components/Event/FullAddressAutoComplete.vue
index 9c6cb521a..6264aa67d 100644
--- a/src/components/Event/FullAddressAutoComplete.vue
+++ b/src/components/Event/FullAddressAutoComplete.vue
@@ -24,7 +24,11 @@
           :required="isRequired"
           v-model="queryTextWithDefault"
           :placeholder="placeholderWithDefault"
-          :formatter="(elem: IAddress) => addressFullName(elem)"
+          :formatter="
+            (elem?: IAddress) => {
+              if (elem) addressFullName(elem);
+            }
+          "
           :debounce="debounceDelay"
           @input="asyncData"
           :icon="canShowLocateMeButton ? null : 'map-marker'"
@@ -63,7 +67,7 @@
           </template>
         </o-autocomplete>
         <o-button
-          :disabled="!queryTextWithDefault"
+          :disabled="!selected"
           @click="resetAddress"
           class="reset-area !h-auto"
           icon-left="close"
@@ -501,9 +505,7 @@ const fieldErrors = computed(() => {
 </script>
 <style lang="scss">
 .autocomplete {
-  .dropdown-menu {
-    z-index: 2000;
-  }
+  z-index: 2000;
 
   .dropdown-item.is-disabled {
     opacity: 1 !important;