diff --git a/src/lib/apis/configs/index.ts b/src/lib/apis/configs/index.ts
index d921cdcd0d..edb80028ed 100644
--- a/src/lib/apis/configs/index.ts
+++ b/src/lib/apis/configs/index.ts
@@ -572,15 +572,8 @@ export const initiateOAuthRedirect = (tool: {
 }) => {
 	sessionStorage.setItem('pendingOAuthToolId', tool.id);
 	sessionStorage.setItem('oauthRedirectInProgressToolId', tool.id);
-	localStorage.setItem('pendingOAuthToolId', tool.id);
-	localStorage.setItem('oauthRedirectInProgressToolId', tool.id);
 	const authUrl = getOAuthClientAuthorizationUrl(tool.serverId, tool.authType ?? 'mcp');
-	const tab = window.open(authUrl, '_blank');
-	if (!tab) {
-		localStorage.removeItem('pendingOAuthToolId');
-		localStorage.removeItem('oauthRedirectInProgressToolId');
-		window.open(authUrl, '_self', 'noopener');
-	}
+	window.open(authUrl, '_self', 'noopener');
 };
 
 export const getCodeExecutionConfig = async (token: string) => {
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 9192c3ee92..d16d9ddbd5 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -1069,24 +1069,6 @@
 
 		window.addEventListener('message', windowMessageEventHandler);
 
-		const pendingOAuthToolId =
-			sessionStorage.getItem('pendingOAuthToolId') ?? localStorage.getItem('pendingOAuthToolId');
-		if (window.opener && window.location.pathname === '/' && pendingOAuthToolId) {
-			window.opener.postMessage(
-				{
-					type: 'oauth:complete',
-					toolId: pendingOAuthToolId,
-					error: new URLSearchParams(window.location.search).get('error')
-				},
-				window.location.origin
-			);
-			sessionStorage.removeItem('pendingOAuthToolId');
-			sessionStorage.removeItem('oauthRedirectInProgressToolId');
-			localStorage.removeItem('pendingOAuthToolId');
-			localStorage.removeItem('oauthRedirectInProgressToolId');
-			window.close();
-		}
-
 		let touchstartY = 0;
 
 		function isNavOrDescendant(el) {