diff --git a/authentication-module/src/main/java/net/jami/jams/authmodule/TokenController.java b/authentication-module/src/main/java/net/jami/jams/authmodule/TokenController.java
index 8f74a1249f2d9b5b7fa02c24c4a4eaaecd6d910a..baac8d49e8c84346f169f29b7de211264d031848 100644
--- a/authentication-module/src/main/java/net/jami/jams/authmodule/TokenController.java
+++ b/authentication-module/src/main/java/net/jami/jams/authmodule/TokenController.java
@@ -72,7 +72,7 @@ public class TokenController{
             signedJWT.sign(new RSASSASigner(signingKey));
             UserAuthenticationModule.datastore.getJwtDao().storeObject(signedJWT);
             authTokenResponse.setAccess_token(signedJWT.serialize());
-            authTokenResponse.setExpires_in(30*60*1000L);
+            authTokenResponse.setExpires_in(30*60L);
             authTokenResponse.setToken_type("Bearer");
             return authTokenResponse;
         }