diff --git a/application/src/main/java/org/thingsboard/server/service/security/model/token/JwtTokenFactory.java b/application/src/main/java/org/thingsboard/server/service/security/model/token/JwtTokenFactory.java
index f2e276a0ef..a47d0034a7 100644
--- a/application/src/main/java/org/thingsboard/server/service/security/model/token/JwtTokenFactory.java
+++ b/application/src/main/java/org/thingsboard/server/service/security/model/token/JwtTokenFactory.java
@@ -210,11 +210,12 @@ public class JwtTokenFactory {
 
         ZonedDateTime currentTime = ZonedDateTime.now();
 
+        claimsBuilder.expiration(Date.from(currentTime.plusSeconds(expirationTime).toInstant()));
+
         return Jwts.builder()
                 .claims(claimsBuilder.build())
                 .issuer(jwtSettingsService.getJwtSettings().getTokenIssuer())
                 .issuedAt(Date.from(currentTime.toInstant()))
-                .expiration(Date.from(currentTime.plusSeconds(expirationTime).toInstant()))
                 .signWith(getSecretKey(false), Jwts.SIG.HS512);
     }