diff --git a/packages/passport/sdk/src/authManager.test.ts b/packages/passport/sdk/src/authManager.test.ts
index 54f2c40f94..3bd7bc0ddd 100644
--- a/packages/passport/sdk/src/authManager.test.ts
+++ b/packages/passport/sdk/src/authManager.test.ts
@@ -460,7 +460,7 @@ describe('AuthManager', () => {
 
       await expect(() => authManager.getUser()).rejects.toThrow(
         new PassportError(
-          'Failed to refresh token: oops',
+          'Failed to refresh token: oops: Failed to remove user: this.userManager.removeUser is not a function',
           PassportErrorType.AUTHENTICATION_ERROR,
         ),
       );
diff --git a/packages/passport/sdk/src/authManager.ts b/packages/passport/sdk/src/authManager.ts
index f1fafab3ef..fc3edc4aba 100644
--- a/packages/passport/sdk/src/authManager.ts
+++ b/packages/passport/sdk/src/authManager.ts
@@ -481,18 +481,31 @@ export default class AuthManager {
       } catch (err) {
         let passportErrorType = PassportErrorType.AUTHENTICATION_ERROR;
         let errorMessage = 'Failed to refresh token';
+        let removeUser = true;
 
         if (err instanceof ErrorTimeout) {
           passportErrorType = PassportErrorType.SILENT_LOGIN_ERROR;
+          errorMessage = `${errorMessage}: ${err.message}`;
+          removeUser = false;
         } else if (err instanceof ErrorResponse) {
           passportErrorType = PassportErrorType.NOT_LOGGED_IN_ERROR;
-          errorMessage = `${err.message}: ${err.error_description}`;
+          errorMessage = `${errorMessage}: ${err.message || err.error_description}`;
         } else if (err instanceof Error) {
-          errorMessage = err.message;
+          errorMessage = `${errorMessage}: ${err.message}`;
         } else if (typeof err === 'string') {
           errorMessage = `${errorMessage}: ${err}`;
         }
 
+        if (removeUser) {
+          try {
+            await this.userManager.removeUser();
+          } catch (removeUserError) {
+            if (removeUserError instanceof Error) {
+              errorMessage = `${errorMessage}: Failed to remove user: ${removeUserError.message}`;
+            }
+          }
+        }
+
         reject(new PassportError(errorMessage, passportErrorType));
       } finally {
         this.refreshingPromise = null; // Reset the promise after completion