diff --git a/api/src/gateway/gateway.service.spec.ts b/api/src/gateway/gateway.service.spec.ts
index a50732e..b5b9d1e 100644
--- a/api/src/gateway/gateway.service.spec.ts
+++ b/api/src/gateway/gateway.service.spec.ts
@@ -180,7 +180,14 @@ describe('GatewayService', () => {
       })
       expect(service.updateDevice).toHaveBeenCalledWith(
         mockDevice._id.toString(),
-        { ...mockDeviceInput, enabled: true, user: mockUser }
+        expect.objectContaining({
+          ...mockDeviceInput,
+          enabled: true,
+          user: mockUser,
+          fcmTokenUpdatedAt: expect.any(Date),
+          fcmTokenInvalidatedAt: undefined,
+          fcmTokenInvalidReason: undefined,
+        }),
       )
       expect(result).toBeDefined()
       
@@ -202,6 +209,9 @@ describe('GatewayService', () => {
       expect(mockDeviceModel.create).toHaveBeenCalledWith({
         ...mockDeviceInput,
         user: mockUser,
+        fcmTokenUpdatedAt: expect.any(Date),
+        fcmTokenInvalidatedAt: undefined,
+        fcmTokenInvalidReason: undefined,
       })
       expect(result).toBeDefined()
     })