diff --git a/client/src/lib/auth.ts b/client/src/lib/auth.ts
index 39b489d..65650fd 100644
--- a/client/src/lib/auth.ts
+++ b/client/src/lib/auth.ts
@@ -90,8 +90,8 @@ export class InspectorOAuthClientProvider implements OAuthClientProvider {
   }
 
   clear() {
-    sessionStorage.removeItem(SESSION_KEYS.CLIENT_INFORMATION);
-    sessionStorage.removeItem(SESSION_KEYS.TOKENS);
-    sessionStorage.removeItem(SESSION_KEYS.CODE_VERIFIER);
+    sessionStorage.removeItem(getServerSpecificKey(SESSION_KEYS.CLIENT_INFORMATION, this.serverUrl));
+    sessionStorage.removeItem(getServerSpecificKey(SESSION_KEYS.TOKENS, this.serverUrl));
+    sessionStorage.removeItem(getServerSpecificKey(SESSION_KEYS.CODE_VERIFIER, this.serverUrl));
   }
 }
diff --git a/client/src/lib/hooks/useConnection.ts b/client/src/lib/hooks/useConnection.ts
index 8c5c009..73f2e1c 100644
--- a/client/src/lib/hooks/useConnection.ts
+++ b/client/src/lib/hooks/useConnection.ts
@@ -396,6 +396,7 @@ export function useConnection({
 
   const disconnect = async () => {
     await mcpClient?.close();
+    const authProvider = new InspectorOAuthClientProvider(sseUrl);
     authProvider.clear();
     setMcpClient(null);
     setConnectionStatus("disconnected");