diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index a92ba29ee..633f1254d 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -106,7 +106,7 @@ const isLoading = ref(false);
 const isResetting = ref(false);
 const hasChanges = ref(!$props.observeFormChanges);
 const originalData = computed(() => state.get(modelValue));
-const formData = ref({});
+const formData = ref();
 const defaultButtons = computed(() => ({
     save: {
         dataCy: 'saveDefaultBtn',
diff --git a/src/pages/Customer/components/CustomerAddressEdit.vue b/src/pages/Customer/components/CustomerAddressEdit.vue
index af1b9c160..f852c160a 100644
--- a/src/pages/Customer/components/CustomerAddressEdit.vue
+++ b/src/pages/Customer/components/CustomerAddressEdit.vue
@@ -233,7 +233,7 @@ function handleLocation(data, location) {
                             postcode: data.postalCode,
                             city: data.city,
                             province: data.province,
-                            country: data.province.country,
+                            country: data.province?.country,
                         }"
                         @update:model-value="(location) => handleLocation(data, location)"
                     ></VnLocation>