diff --git a/client/src/App.tsx b/client/src/App.tsx
index 5c09e8e..c756903 100644
--- a/client/src/App.tsx
+++ b/client/src/App.tsx
@@ -47,6 +47,7 @@ import ToolsTab from "./components/ToolsTab";
 import { DEFAULT_INSPECTOR_CONFIG } from "./lib/constants";
 import { InspectorConfig } from "./lib/configurationTypes";
 import { useToast } from "@/hooks/use-toast";
+
 const params = new URLSearchParams(window.location.search);
 const PROXY_PORT = params.get("proxyPort") ?? "6277";
 const PROXY_SERVER_URL = `http://${window.location.hostname}:${PROXY_PORT}`;
@@ -197,8 +198,13 @@ const App = () => {
     localStorage.setItem(CONFIG_LOCAL_STORAGE_KEY, JSON.stringify(config));
   }, [config]);
 
+  const hasProcessedRef = useRef(false);
   // Auto-connect if serverUrl is provided in URL params (e.g. after OAuth callback)
   useEffect(() => {
+    if (hasProcessedRef.current) {
+      // Only try to connect once
+      return;
+    }
     const serverUrl = params.get("serverUrl");
     if (serverUrl) {
       setSseUrl(serverUrl);
@@ -212,6 +218,7 @@ const App = () => {
         title: "Success",
         description: "Successfully authenticated with OAuth",
       });
+      hasProcessedRef.current = true;
       // Connect to the server
       connectMcpServer();
     }