diff --git a/packages/server/src/entities/BaseEntity.ts b/packages/server/src/entities/BaseEntity.ts
index 3d5c4f9..8eaa765 100644
--- a/packages/server/src/entities/BaseEntity.ts
+++ b/packages/server/src/entities/BaseEntity.ts
@@ -5,7 +5,7 @@ import {
 } from 'typeorm'
 
 const transformer = {
-  from: (value: Date) => value.toISOString(),
+  from: (value: Date) => !isNaN(value.getTime()) ? value.toISOString() : value,
   to: (value: undefined | null | string) => value ? new Date(value) : value,
 }
 
diff --git a/packages/server/src/services/UserService.test.ts b/packages/server/src/services/UserService.test.ts
index 36bf518..daca354 100644
--- a/packages/server/src/services/UserService.test.ts
+++ b/packages/server/src/services/UserService.test.ts
@@ -62,8 +62,8 @@ describe('UserService', () => {
         id: jasmine.any(Number),
         userId: id,
         email: username,
-        createDate: jasmine.any(Date),
-        updateDate: jasmine.any(Date),
+        createDate: jasmine.any(String),
+        updateDate: jasmine.any(String),
       }])
     })
   })
diff --git a/packages/server/src/team/TeamService.ts b/packages/server/src/team/TeamService.ts
index 8aeab82..a937a99 100644
--- a/packages/server/src/team/TeamService.ts
+++ b/packages/server/src/team/TeamService.ts
@@ -31,7 +31,7 @@ export class TeamService implements ITeamService {
       roleId: 1,
     })
 
-    return team
+    return (await this.findOne(team.id))!
   }
 
   async remove({id, userId}: {id: number, userId: number}) {