diff --git a/src/controllers/ProfileController.ts b/src/controllers/ProfileController.ts
index 3b8adf81..b1264e94 100644
--- a/src/controllers/ProfileController.ts
+++ b/src/controllers/ProfileController.ts
@@ -1615,7 +1615,7 @@ export class ProfileController extends Controller {
           ).toLocaleString(),
         )
       : "";
-    const fullCurrentAddress = profiles
+    const fullCurrentAddress = profiles && profiles.currentAddress
       ? Extension.ToThaiNumber(
           profiles.currentAddress +
             " ตำบล/แขวง " +
@@ -1627,7 +1627,7 @@ export class ProfileController extends Controller {
             profiles.currentZipCode,
         )
       : "";
-    const fullRegistrationAddress = profiles
+    const fullRegistrationAddress = profiles && profiles.registrationAddress
       ? Extension.ToThaiNumber(
           profiles.registrationAddress +
             " ตำบล/แขวง " +