diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddressDetails/AddressDetailsButton.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddressDetails/AddressDetailsButton.vue
index eb26ff738..026e55c1f 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddressDetails/AddressDetailsButton.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddressDetails/AddressDetailsButton.vue
@@ -17,7 +17,8 @@
     :address="data.working_address"
     @update-address="onUpdateAddress"
     ref="address_modal"
-  ></AddressModal>
+    v-else-if="data.working_address"
+  />
 </template>
 
 <script lang="ts" setup>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddressDetails/Parts/AddressDetailsRefMatching.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddressDetails/Parts/AddressDetailsRefMatching.vue
index 43dea5d4b..483f17941 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddressDetails/Parts/AddressDetailsRefMatching.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddressDetails/Parts/AddressDetailsRefMatching.vue
@@ -20,8 +20,8 @@
 
       <template
         v-if="
-          props.address.addressReference.street !== props.address.street ||
-          props.address.addressReference.streetNumber !==
+          props.address.addressReference?.street !== props.address.street ||
+          props.address.addressReference?.streetNumber !==
             props.address.streetNumber
         "
       >
@@ -31,8 +31,8 @@
               >{{ props.address.street }} {{ props.address.streetNumber }}</span
             >
             <span class="new"
-              >{{ props.address.addressReference.street }}
-              {{ props.address.addressReference.streetNumber }}</span
+              >{{ props.address.addressReference?.street }}
+              {{ props.address.addressReference?.streetNumber }}</span
             >
           </div>
         </template>
@@ -42,8 +42,8 @@
               >{{ props.address.streetNumber }} {{ props.address.street }}</span
             >
             <span class="new"
-              >{{ props.address.addressReference.streetNumber }}
-              {{ props.address.addressReference.street }}</span
+              >{{ props.address.addressReference?.streetNumber }}
+              {{ props.address.addressReference?.street }}</span
             >
           </div>
         </template>
@@ -51,7 +51,7 @@
 
       <template
         v-if="
-          props.address.addressReference.postcode.id !==
+          props.address.addressReference?.postcode.id !==
           props.address.postcode.id
         "
       >
@@ -61,8 +61,8 @@
             {{ props.address.postcode.name }}</span
           >
           <span class="new"
-            >{{ props.address.addressReference.postcode.code }}
-            {{ props.address.addressReference.postcode.name }}</span
+            >{{ props.address.addressReference?.postcode.code }}
+            {{ props.address.addressReference?.postcode.name }}</span
           >
         </div>
       </template>
@@ -71,9 +71,9 @@
         v-if="
           props.address.point !== null &&
           (props.address.point.coordinates[0] !==
-            props.address.addressReference.point.coordinates[0] ||
+            props.address.addressReference?.point.coordinates[0] ||
             props.address.point.coordinates[1] !==
-              props.address.addressReference.point.coordinates[1])
+              props.address.addressReference?.point.coordinates[1])
         "
       >
         <div class="difference">
@@ -82,8 +82,8 @@
             {{ props.address.point.coordinates[1] }}</span
           >
           <span class="new"
-            >{{ props.address.addressReference.point.coordinates[0] }}
-            {{ props.address.addressReference.point.coordinates[1] }}</span
+            >{{ props.address.addressReference?.point.coordinates[0] }}
+            {{ props.address.addressReference?.point.coordinates[1] }}</span
           >
         </div>
       </template>