diff --git a/packages/atlas-service/src/store/atlas-signin-reducer.ts b/packages/atlas-service/src/store/atlas-signin-reducer.ts
index 0745d150ea6..447630a85ad 100644
--- a/packages/atlas-service/src/store/atlas-signin-reducer.ts
+++ b/packages/atlas-service/src/store/atlas-signin-reducer.ts
@@ -117,7 +117,7 @@ export const AttemptStateMap = new Map<number, AttemptState>();
 
 export let attemptId = 0;
 
-export function getAttempt(id?: number | null): AttemptState {
+function getAttempt(id?: number | null): AttemptState {
   if (!id) {
     id = ++attemptId;
     const controller = new AbortController();
@@ -360,6 +360,7 @@ export const signIn = (): AtlasSignInThunkAction<Promise<void>> => {
       });
       dispatch({ type: AtlasSignInActions.Success, userInfo });
       atlasAuthService.emit('signed-in');
+      AttemptStateMap.clear();
       resolve(userInfo);
     } catch (err) {
       // Only handle error if sign in wasn't aborted by the user, otherwise it
diff --git a/packages/compass-generative-ai/src/store/atlas-optin-reducer.ts b/packages/compass-generative-ai/src/store/atlas-optin-reducer.ts
index a2268e13ad5..d6f167fdc1b 100644
--- a/packages/compass-generative-ai/src/store/atlas-optin-reducer.ts
+++ b/packages/compass-generative-ai/src/store/atlas-optin-reducer.ts
@@ -277,6 +277,7 @@ export const optIn = (): GenAIAtlasOptInThunkAction<Promise<void>> => {
       throwIfAborted(signal);
       await atlasAiService.optIntoGenAIFeatures();
       dispatch(atlasAiServiceOptedIn());
+      AttemptStateMap.clear();
       resolve();
     } catch (err) {
       if (signal.aborted) {