diff --git a/src/components/03_customer-management/FormEmployeePassport.vue b/src/components/03_customer-management/FormEmployeePassport.vue
index 0afe325d..b09862ba 100644
--- a/src/components/03_customer-management/FormEmployeePassport.vue
+++ b/src/components/03_customer-management/FormEmployeePassport.vue
@@ -48,16 +48,18 @@ let passportIssuingCountryFilter: (
 ) => void;
 
 onMounted(() => {
-  passportTypeFilter = selectFilterOptionRefMod(
-    ref(optionStore.globalOption.nationality),
-    passportTypeOptions,
-    'label',
-  );
-  passportIssuingCountryFilter = selectFilterOptionRefMod(
-    ref(optionStore.globalOption.nationality),
-    passportIssuingCountryOptions,
-    'label',
-  );
+  if (optionStore.globalOption?.nationality) {
+    passportTypeFilter = selectFilterOptionRefMod(
+      ref(optionStore.globalOption.nationality),
+      passportTypeOptions,
+      'label',
+    );
+    passportIssuingCountryFilter = selectFilterOptionRefMod(
+      ref(optionStore.globalOption.nationality),
+      passportIssuingCountryOptions,
+      'label',
+    );
+  }
 });
 
 watch(
diff --git a/src/components/03_customer-management/FormEmployeeVisa.vue b/src/components/03_customer-management/FormEmployeeVisa.vue
index 525c3db9..d68637fb 100644
--- a/src/components/03_customer-management/FormEmployeeVisa.vue
+++ b/src/components/03_customer-management/FormEmployeeVisa.vue
@@ -71,7 +71,7 @@ let visaTypeFilter: (
 
 onMounted(() => {
   visaTypeFilter = selectFilterOptionRefMod(
-    optionStore.globalOption?.nationality,
+    ref(optionStore.globalOption?.nationality),
     visaTypeOptions,
     'label',
   );