diff --git a/src/controllers/ProfileController.ts b/src/controllers/ProfileController.ts
index a3f592b3..12582e36 100644
--- a/src/controllers/ProfileController.ts
+++ b/src/controllers/ProfileController.ts
@@ -402,7 +402,7 @@ export class ProfileController extends Controller {
    *
    * @param {string} id  Id โปรไฟล์
    */
-  @Get("kk1/{id}")
+  @Get("kk1old/{id}")
   public async getKk1(@Path() id: string, @Request() req: RequestWithUser) {
     const profiles = await this.profileRepo.findOne({
       relations: ["currentSubDistrict", "currentDistrict", "currentProvince", "profileAvatars"],
@@ -874,7 +874,7 @@ export class ProfileController extends Controller {
    *
    * @param {string} id  Id โปรไฟล์
    */
-  @Get("kk1new/{id}")
+  @Get("kk1/{id}")
   public async getKk1new(@Path() id: string, @Request() req: RequestWithUser) {
     const profiles = await this.profileRepo.findOne({
       relations: ["currentSubDistrict", "currentDistrict", "currentProvince","registrationSubDistrict", "registrationDistrict", "registrationProvince", "profileAvatars"],
@@ -1014,10 +1014,10 @@ export class ProfileController extends Controller {
         ? cert_raw.slice(-2).map((item) => ({
             certificateType: item.certificateType ?? null,
             issuer: item.issuer ?? null,
-            certificateNo: Extension.ToThaiNumber(item.certificateNo) ?? null,
-            issueDate: Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.issueDate)) ?? null,
-            expireDate: Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.expireDate)) ?? null,
-            issueToExpireDate: Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.issueDate)) ?? "" + item.expireDate?" - " + Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.expireDate)): null,
+            certificateNo: item.certificateNo?Extension.ToThaiNumber(item.certificateNo):null,
+            issueDate: item.issueDate?Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.issueDate)):null,
+            expireDate: item.expireDate?Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.expireDate)):null,
+            issueToExpireDate: item.issueDate?Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.issueDate)):"" + item.expireDate?" - " + Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.expireDate)): null,
           }))
         : [
             {