diff --git a/src/pages/Zone/ZoneDeliveryDays.vue b/src/pages/Zone/ZoneDeliveryDays.vue
index 872b62184..d6ce70f6d 100644
--- a/src/pages/Zone/ZoneDeliveryDays.vue
+++ b/src/pages/Zone/ZoneDeliveryDays.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { computed, onMounted, ref, watch } from 'vue';
+import { computed, onMounted, ref, watch, onUnmounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 import ZoneDeliveryPanel from './ZoneDeliveryPanel.vue';
@@ -23,9 +23,10 @@ const days = ref({});
 const exclusions = ref({});
 const geoExclusions = ref({});
 const events = ref([]);
-const { store } = useArrayData('ZoneDeliveryDays', {
+const arrayData = useArrayData('ZoneDeliveryDays', {
     url: 'Zones/getEvents',
 });
+const { store } = arrayData;
 
 const refreshEvents = () => {
     days.value = {};
@@ -174,6 +175,8 @@ onMounted(async () => {
     date.value = initialDate;
     weekdayStore.initStore();
 });
+
+onUnmounted(() => arrayData.destroy());
 </script>
 
 <template>
diff --git a/src/pages/Zone/ZoneDeliveryPanel.vue b/src/pages/Zone/ZoneDeliveryPanel.vue
index 9b307c6ed..1295bb63d 100644
--- a/src/pages/Zone/ZoneDeliveryPanel.vue
+++ b/src/pages/Zone/ZoneDeliveryPanel.vue
@@ -87,11 +87,9 @@ const onSubmit = async () => {
 
 onMounted(async () => {
     deliveryMethodFk.value = 'delivery';
-    await fetchData();
-    if (arrayData?.store?.userParams && arrayData?.store?.userParams) {
-        formData.geoFk = arrayData.store?.userParams?.geoFk;
-        formData.agencyModeFk = arrayData.store?.userParams?.agencyModeFk;
-    }
+    formData.geoFk = arrayData.store?.userParams?.geoFk;
+    formData.agencyModeFk = arrayData.store?.userParams?.agencyModeFk;
+    if (formData.geoFk || formData.agencyModeFk) await fetchData();
 });
 </script>