diff --git a/src/components/shared/DatePicker.vue b/src/components/shared/DatePicker.vue
index 799b5749..e04aa857 100644
--- a/src/components/shared/DatePicker.vue
+++ b/src/components/shared/DatePicker.vue
@@ -25,7 +25,7 @@ function valueUpdate(value: string) {
   }
 
   if (value.length === 10) {
-    const _date = parseAndFormatDate(value, i18n.locale.value);
+    const _date = parseAndFormatDate(value);
 
     if (_date) {
       if (Array.isArray(props.disabledDates)) {
diff --git a/src/utils/datetime.ts b/src/utils/datetime.ts
index ce0cb6e1..9dd35dd3 100644
--- a/src/utils/datetime.ts
+++ b/src/utils/datetime.ts
@@ -139,20 +139,12 @@ export function disabledAfterToday(date: Date) {
   return date > today;
 }
 
-export function parseAndFormatDate(
-  value: string | number | undefined,
-  locale: string,
-) {
+export function parseAndFormatDate(value: string | number | undefined) {
   if (!value) return;
 
   if (value && value.toString().length === 10) {
     const [date, month, year] = value.toString().split('/');
-    if (locale === 'tha') {
-      const adjustedYear = Number(year) - 543;
-      return new Date(`${adjustedYear}-${month}-${date}T00:00:00.000Z`);
-    } else {
-      return new Date(`${year}-${month}-${date}T00:00:00.000Z`);
-    }
+    return new Date(`${year}-${month}-${date}T00:00:00.000Z`);
   }
   return null;
 }