diff --git a/packages/journey-client/src/index.ts b/packages/journey-client/src/index.ts
index c51b07963..04d5c8309 100644
--- a/packages/journey-client/src/index.ts
+++ b/packages/journey-client/src/index.ts
@@ -6,3 +6,6 @@
  */
 
 export * from './lib/client.store.js';
+
+// Re-export types from internal packages that consumers need
+export { callbackType } from '@forgerock/sdk-types';
diff --git a/packages/journey-client/src/types.ts b/packages/journey-client/src/types.ts
index ed7cade5f..5ec9b606c 100644
--- a/packages/journey-client/src/types.ts
+++ b/packages/journey-client/src/types.ts
@@ -13,7 +13,6 @@ export type {
   Callback,
   CallbackType,
   StepType,
-  callbackType,
   GenericError,
   PolicyRequirement,
   FailedPolicyRequirement,
diff --git a/packages/oidc-client/src/lib/client.store.ts b/packages/oidc-client/src/lib/client.store.ts
index 4c0bc8135..9e32712a1 100644
--- a/packages/oidc-client/src/lib/client.store.ts
+++ b/packages/oidc-client/src/lib/client.store.ts
@@ -289,16 +289,18 @@ export async function oidc<ActionType extends ActionTypes = ActionTypes>({
               options: storageOptions,
             });
           }),
-          Micro.tap(async (tokens) => {
-            await store.dispatch(
-              oidcApi.endpoints.revoke.initiate({
-                accessToken: tokens.accessToken,
-                clientId: config.clientId,
-                endpoint: wellknown.revocation_endpoint,
-              }),
-            );
-            await storageClient.remove();
-            await storageClient.set(tokens);
+          Micro.tap(async (newTokens) => {
+            if (tokens && 'accessToken' in tokens) {
+              await store.dispatch(
+                oidcApi.endpoints.revoke.initiate({
+                  accessToken: tokens.accessToken,
+                  clientId: config.clientId,
+                  endpoint: wellknown.revocation_endpoint,
+                }),
+              );
+              await storageClient.remove();
+            }
+            await storageClient.set(newTokens);
           }),
         );