diff --git a/src/controllers/ProfileController.ts b/src/controllers/ProfileController.ts
index 88946386..99ac32e5 100644
--- a/src/controllers/ProfileController.ts
+++ b/src/controllers/ProfileController.ts
@@ -386,14 +386,12 @@ export class ProfileController extends Controller {
       Start:
         item.startDate == null
           ? ""
-          : Extension.ToThaiNumber(new Date(item.startDate).getFullYear().toString()),
+          : Extension.ToThaiNumber(Extension.ToThaiShortDate(item.startDate)),
       End:
-        item.endDate == null
-          ? ""
-          : Extension.ToThaiNumber(new Date(item.endDate).getFullYear().toString()),
+        item.endDate == null ? "" : Extension.ToThaiNumber(Extension.ToThaiShortDate(item.endDate)),
       Date:
         item.startDate && item.endDate
-          ? `${Extension.ToThaiNumber(new Date(item.startDate).getFullYear().toString())} - ${Extension.ToThaiNumber(new Date(item.endDate).getFullYear().toString())}`
+          ? `${Extension.ToThaiNumber(Extension.ToThaiShortDate(item.startDate))} - ${Extension.ToThaiNumber(Extension.ToThaiShortDate(item.endDate))}`
           : "",
       Level: "",
       Degree: item.name,
@@ -427,7 +425,7 @@ export class ProfileController extends Controller {
           : Extension.ToThaiNumber(new Date(item.endDate).getFullYear().toString()),
       Date:
         item.startDate && item.endDate
-          ? `${Extension.ToThaiNumber(new Date(item.startDate).getFullYear().toString())} - ${Extension.ToThaiNumber(new Date(item.endDate).getFullYear().toString())}`
+          ? `${Extension.ToThaiNumber(Extension.ToThaiShortDate(item.startDate))} - ${Extension.ToThaiNumber(Extension.ToThaiShortDate(item.endDate))}`
           : "",
       Level: item.educationLevel ?? "",
       Degree: item.degree && item.field ? `${item.degree} ${item.field}` : "",
diff --git a/src/controllers/ProfileEmployeeController.ts b/src/controllers/ProfileEmployeeController.ts
index 855b8ba5..55638bf1 100644
--- a/src/controllers/ProfileEmployeeController.ts
+++ b/src/controllers/ProfileEmployeeController.ts
@@ -406,7 +406,7 @@ export class ProfileEmployeeController extends Controller {
           : Extension.ToThaiNumber(new Date(item.endDate).getFullYear().toString()),
       Date:
         item.startDate && item.endDate
-          ? `${Extension.ToThaiNumber(new Date(item.startDate).getFullYear().toString())} - ${Extension.ToThaiNumber(new Date(item.endDate).getFullYear().toString())}`
+          ? `${Extension.ToThaiNumber(Extension.ToThaiShortDate(item.startDate))} - ${Extension.ToThaiNumber(Extension.ToThaiShortDate(item.endDate))}`
           : "",
       Level: "",
       Degree: item.name,
@@ -433,7 +433,7 @@ export class ProfileEmployeeController extends Controller {
       End: new Date(item.endDate).getFullYear().toString() ?? null,
       Date:
         item.startDate && item.endDate
-          ? `${Extension.ToThaiNumber(new Date(item.startDate).getFullYear().toString())} - ${Extension.ToThaiNumber(new Date(item.endDate).getFullYear().toString())}`
+          ? `${Extension.ToThaiNumber(Extension.ToThaiShortDate(item.startDate))} - ${Extension.ToThaiNumber(Extension.ToThaiShortDate(item.endDate))}`
           : "",
       Level: item.educationLevel ?? null,
       Degree: item.degree && item.field ? `${item.degree} ${item.field}` : "",