diff --git a/application/src/main/java/org/thingsboard/server/service/security/auth/jwt/settings/DefaultJwtSettingsService.java b/application/src/main/java/org/thingsboard/server/service/security/auth/jwt/settings/DefaultJwtSettingsService.java
index df822812ec..139b177926 100644
--- a/application/src/main/java/org/thingsboard/server/service/security/auth/jwt/settings/DefaultJwtSettingsService.java
+++ b/application/src/main/java/org/thingsboard/server/service/security/auth/jwt/settings/DefaultJwtSettingsService.java
@@ -43,7 +43,7 @@ public class DefaultJwtSettingsService implements JwtSettingsService {
     private final Optional<TbClusterService> tbClusterService;
     private final JwtSettingsValidator jwtSettingsValidator;
     @Lazy
-    private final JwtTokenFactory jwtTokenFactory;
+    private final Optional<JwtTokenFactory> jwtTokenFactory;
 
     private volatile JwtSettings jwtSettings = null; //lazy init
 
@@ -67,7 +67,7 @@ public class DefaultJwtSettingsService implements JwtSettingsService {
     public JwtSettings reloadJwtSettings() {
         log.trace("Executing reloadJwtSettings");
         var settings = getJwtSettings(true);
-        jwtTokenFactory.reload();
+        jwtTokenFactory.ifPresent(JwtTokenFactory::reload);
         return settings;
     }