diff --git a/server/Auth.js b/server/Auth.js
index dc21aa37..c8376ff6 100644
--- a/server/Auth.js
+++ b/server/Auth.js
@@ -19,7 +19,7 @@ class Auth {
   /**
    * Inializes all passportjs stragegies and other passportjs ralated initialization.
    */
-  initPassportJs() {
+  async initPassportJs() {
     // Check if we should load the local strategy
     if (global.ServerSettings.authActiveAuthMethods.includes("local")) {
       passport.use(new LocalStrategy(this.localAuthCheckUserPw.bind(this)))
@@ -70,6 +70,10 @@ class Auth {
         }).bind(this)))
     }
 
+    if (!global.ServerSettings.tokenSecret) {
+      await this.initTokenSecret()
+    }
+
     // Load the JwtStrategy (always) -> for bearer token auth 
     passport.use(new JwtStrategy({
       jwtFromRequest: ExtractJwt.fromAuthHeaderAsBearerToken(),