diff --git a/packages/javascript-sdk/src/oauth2-client/state-pkce.ts b/packages/javascript-sdk/src/oauth2-client/state-pkce.ts
index fb800558..0f34a1ce 100644
--- a/packages/javascript-sdk/src/oauth2-client/state-pkce.ts
+++ b/packages/javascript-sdk/src/oauth2-client/state-pkce.ts
@@ -46,13 +46,14 @@ export function generateAndStoreAuthUrlValues(options: GenerateAndStoreAuthUrlVa
 
 /**
  * @function getStoredAuthUrlValues - Retrieve stored authorization options from sessionStorage
- * @param { string } storageKey - Key to retrieve stored values from sessionStorage
- * @returns { GetAuthorizationUrlOptions }
+ * @param { string } clientId - Client ID
+ * @param { string } [prefix] - Prefix for storage key
+ * @returns { GetAuthorizationUrlOptions | null }
  */
 export function getStoredAuthUrlValues(
   clientId: string,
   prefix?: string,
-): GetAuthorizationUrlOptions {
+): GetAuthorizationUrlOptions | null {
   const storageKey = getStorageKey(clientId, prefix);
   const storedString = sessionStorage.getItem(storageKey);
   sessionStorage.removeItem(storageKey);
diff --git a/packages/javascript-sdk/src/token-manager/index.ts b/packages/javascript-sdk/src/token-manager/index.ts
index a1fc7302..999f6272 100644
--- a/packages/javascript-sdk/src/token-manager/index.ts
+++ b/packages/javascript-sdk/src/token-manager/index.ts
@@ -128,7 +128,7 @@ abstract class TokenManager {
      * and return acquired tokens
      */
     if (options?.query?.code && options?.query?.state) {
-      const { state, verifier } = getStoredAuthUrlValues(clientId, prefix);
+      const { state, verifier } = getStoredAuthUrlValues(clientId, prefix) ?? {};
 
       if (state === undefined || verifier === undefined) {
         throw new Error(