diff --git a/packages/core/src/event-listeners/access-token.ts b/packages/core/src/event-listeners/access-token.ts
index 198f78bc8..b89de7822 100644
--- a/packages/core/src/event-listeners/access-token.ts
+++ b/packages/core/src/event-listeners/access-token.ts
@@ -4,7 +4,7 @@ import { getUtcStartOfToday } from '#src/oidc/utils.js';
 import type Queries from '#src/tenants/Queries.js';
 
 export const accessTokenIssuedListener = async (
-  accessToken: { accountId: string },
+  accessToken: { accountId?: string },
   queries: Queries
 ) => {
   const { accountId } = accessToken;
diff --git a/packages/core/src/event-listeners/index.ts b/packages/core/src/event-listeners/index.ts
index b61a33f48..888945346 100644
--- a/packages/core/src/event-listeners/index.ts
+++ b/packages/core/src/event-listeners/index.ts
@@ -18,6 +18,9 @@ export const addOidcEventListeners = (provider: Provider, queries: Queries) => {
   provider.addListener('access_token.issued', async (token) => {
     return accessTokenIssuedListener(token, queries);
   });
+  provider.addListener('access_token.saved', async (token) => {
+    return accessTokenIssuedListener(token, queries);
+  });
   provider.addListener('interaction.started', interactionStartedListener);
   provider.addListener('interaction.ended', interactionEndedListener);
   provider.addListener('server_error', (_, error) => {