diff --git a/packages/oidc-client/src/renewTokens.ts b/packages/oidc-client/src/renewTokens.ts
index dbcec1497..8d80ebb5b 100644
--- a/packages/oidc-client/src/renewTokens.ts
+++ b/packages/oidc-client/src/renewTokens.ts
@@ -1,7 +1,7 @@
 import {initSession} from './initSession.js';
 import {initWorkerAsync} from './initWorker.js';
 import Oidc from './oidc.js';
-import {computeTimeLeft} from './parseTokens.js';
+import {computeTimeLeft, setTokens} from './parseTokens.js';
 import timer from './timer.js';
 import {StringMap} from './types.js';
 
@@ -32,7 +32,9 @@ async function loadLatestTokensAsync(oidc, configuration) {
         return tokens;
     } else {
         const session = initSession(oidc.configurationName, configuration.storage ?? sessionStorage);
-        const {tokens} = await session.initAsync();
+        let {tokens} = await session.initAsync();
+        // @ts-ignore
+        tokens = setTokens(tokens, oidc.tokens, configuration.token_renew_mode);
         return tokens;
     }
 }
diff --git a/packages/oidc-client/src/requests.ts b/packages/oidc-client/src/requests.ts
index 345660ace..176a25c63 100644
--- a/packages/oidc-client/src/requests.ts
+++ b/packages/oidc-client/src/requests.ts
@@ -3,7 +3,6 @@ import { deriveChallengeAsync, generateRandom } from './crypto.js';
 import { OidcAuthorizationServiceConfiguration } from './oidc.js';
 import { parseOriginalTokens } from './parseTokens.js';
 import { Fetch, StringMap } from './types.js';
-import EC, {JWK, JWT} from './jwt';
 import {ILOidcLocation} from "./location";
 
 const oneHourSecond = 60 * 60;