diff --git a/src/components/form/AddressForm.vue b/src/components/form/AddressForm.vue
index 606d62c0..afe5ed0a 100644
--- a/src/components/form/AddressForm.vue
+++ b/src/components/form/AddressForm.vue
@@ -91,6 +91,7 @@ const fullAddress = computed(() => {
   if (province && district && sDistrict) {
     const fullAddress = formatAddress({
       address: address.value,
+      addressEN: addressEN.value,
       moo: moo.value ? moo.value : '',
       mooEN: mooEN.value ? mooEN.value : '',
       soi: soi.value ? soi.value : '',
@@ -116,6 +117,7 @@ const fullAddressEN = computed(() => {
   if (province && district && sDistrict) {
     const fullAddress = formatAddress({
       address: address.value,
+      addressEN: addressEN.value,
       moo: moo.value ? moo.value : '',
       mooEN: mooEN.value ? mooEN.value : '',
       soi: soi.value ? soi.value : '',
diff --git a/src/utils/address.ts b/src/utils/address.ts
index 0d05ad94..cc4ee0c8 100644
--- a/src/utils/address.ts
+++ b/src/utils/address.ts
@@ -3,6 +3,7 @@ import { District, Province, SubDistrict } from 'src/stores/address';
 
 export function formatAddress(opt: {
   address: string;
+  addressEN: string;
   moo?: string;
   mooEN?: string;
   soi?: string;
@@ -15,19 +16,20 @@ export function formatAddress(opt: {
   en?: boolean;
 }) {
   const { t } = useI18n();
-  const addressParts = [`${opt.address},`];
-
+  let addressParts: string[];
   if (opt.en) {
     // en
-    if (opt.moo) addressParts.push(`Moo ${opt.mooEN},`);
-    if (opt.soi) addressParts.push(`Soi ${opt.soiEN},`);
-    if (opt.street) addressParts.push(`${opt.streetEN} Rd.`);
+    addressParts = [`${opt.addressEN},`];
+    if (opt.mooEN) addressParts.push(`Moo ${opt.mooEN},`);
+    if (opt.soiEN) addressParts.push(`Soi ${opt.soiEN},`);
+    if (opt.streetEN) addressParts.push(`${opt.streetEN} Rd.`);
 
     addressParts.push(`${opt.subDistrict.nameEN} sub-district,`);
     addressParts.push(`${opt.district.nameEN} district,`);
     addressParts.push(`${opt.province.nameEN},`);
   } else {
     // th
+    addressParts = [`${opt.address},`];
     if (opt.moo) addressParts.push(`หมู่ ${opt.moo},`);
     if (opt.soi) addressParts.push(`ซอย ${opt.soi},`);
     if (opt.street) addressParts.push(`ถนน ${opt.street},`);