diff --git a/src/components/shared/DatePicker.vue b/src/components/shared/DatePicker.vue
index 9c57e190..11cd6d91 100644
--- a/src/components/shared/DatePicker.vue
+++ b/src/components/shared/DatePicker.vue
@@ -68,12 +68,6 @@ function valueUpdate(value: string) {
     v-model="model"
     class="col-2"
   >
-    <template #year="{ value }">
-      {{ $i18n.locale === 'tha' ? value + 543 : value }}
-    </template>
-    <template #year-overlay-value="{ value }">
-      {{ $i18n.locale === 'tha' ? value + 543 : value }}
-    </template>
     <template #trigger>
       <q-input
         placeholder="DD/MM/YYYY"
diff --git a/src/utils/datetime.ts b/src/utils/datetime.ts
index 7cea1b5f..21677f0c 100644
--- a/src/utils/datetime.ts
+++ b/src/utils/datetime.ts
@@ -19,21 +19,9 @@ export function dateFormat(
 
   if (!m.isValid()) return '';
 
-  let yearOffset = 0;
-  if (moment.locale() === 'th') {
-    yearOffset = 543;
-  }
-
   if (time) return m.format('HH:mm');
   if (number) {
     let formattedNumberDate = m.format('L');
-    if (yearOffset) {
-      const adjustedYear = m.year() + yearOffset;
-      formattedNumberDate = formattedNumberDate.replace(
-        m.year().toString(),
-        adjustedYear.toString(),
-      );
-    }
     return formattedNumberDate;
   }
 
@@ -42,12 +30,6 @@ export function dateFormat(
     `DD ${monthFormat} YYYY ${time ? ' HH:mm' : ''}`,
   );
 
-  // Adjust year for Buddhist calendar if locale is 'th'
-  if (yearOffset) {
-    const adjustedYear = m.year() + yearOffset;
-    return formattedDate.replace(m.year().toString(), adjustedYear.toString());
-  }
-
   return formattedDate;
 }