diff --git a/src/database/data-source.ts b/src/database/data-source.ts
index ce5ff43c..a2e1f99f 100644
--- a/src/database/data-source.ts
+++ b/src/database/data-source.ts
@@ -35,7 +35,7 @@ export class MyCustomLogger implements Logger {
 export const AppDataSource = new DataSource({
   type: "mysql",
   //   extra: {
-  //     timezone: "Asia/Bangkok", // Set to Bangkok timezone
+  //     timezone: "+07:00", // Bangkok timezone (UTC+7)
   //   },
   database: process.env.DB_NAME,
   host: process.env.DB_HOST,
@@ -45,6 +45,7 @@ export const AppDataSource = new DataSource({
   connectorPackage: "mysql2",
   synchronize: false,
   logging: true,
+  timezone: "Z",
   entities:
     process.env.NODE_ENV !== "production"
       ? ["src/entities/**/*.ts"]