diff --git a/client/src/components/SidePanel/Agents/MCPSection.tsx b/client/src/components/SidePanel/Agents/MCPSection.tsx
index 4575eb8f25..575fc1ec2e 100644
--- a/client/src/components/SidePanel/Agents/MCPSection.tsx
+++ b/client/src/components/SidePanel/Agents/MCPSection.tsx
@@ -2,7 +2,7 @@ import { useCallback } from 'react';
 import { useLocalize } from '~/hooks';
 import { useToastContext } from '~/Providers';
 import { useAgentPanelContext } from '~/Providers/AgentPanelContext';
-import MCP from '~/components/SidePanel/Builder/MCP';
+import { MCPItem } from '~/components/SidePanel/MCP/MCPItem';
 import { Panel } from '~/common';
 
 export default function MCPSection() {
@@ -30,7 +30,7 @@ export default function MCPSection() {
         {mcps
           .filter((mcp) => mcp.agent_id === agent_id)
           .map((mcp, i) => (
-            <MCP
+            <MCPItem
               key={i}
               mcp={mcp}
               onClick={() => {
diff --git a/client/src/components/SidePanel/Builder/MCPAuth.tsx b/client/src/components/SidePanel/MCP/MCPAuth.tsx
similarity index 98%
rename from client/src/components/SidePanel/Builder/MCPAuth.tsx
rename to client/src/components/SidePanel/MCP/MCPAuth.tsx
index 592b114384..067022b4c3 100644
--- a/client/src/components/SidePanel/Builder/MCPAuth.tsx
+++ b/client/src/components/SidePanel/MCP/MCPAuth.tsx
@@ -10,7 +10,6 @@ import {
 } from '~/components/ui/Accordion';
 import { DropdownPopup } from '~/components/ui';
 import { useLocalize } from '~/hooks';
-import { cn } from '~/utils';
 
 interface UserInfoPlaceholder {
   label: string;
@@ -31,14 +30,12 @@ const userInfoPlaceholders: UserInfoPlaceholder[] = [
   { label: 'role', value: '{{LIBRECHAT_USER_ROLE}}', description: 'User role' },
 ];
 
-export default function MCPAuth() {
+export function MCPAuth() {
   const localize = useLocalize();
   const { register, watch, setValue } = useFormContext();
   const [isHeadersMenuOpen, setIsHeadersMenuOpen] = useState(false);
 
   const customHeaders = watch('customHeaders') || [];
-  const requestTimeout = watch('requestTimeout') || '';
-  const connectionTimeout = watch('connectionTimeout') || '';
 
   const addCustomHeader = () => {
     const newHeader = {
diff --git a/client/src/components/SidePanel/MCP/MCPInput.tsx b/client/src/components/SidePanel/MCP/MCPInput.tsx
index 545b0f4afc..de3e48eab7 100644
--- a/client/src/components/SidePanel/MCP/MCPInput.tsx
+++ b/client/src/components/SidePanel/MCP/MCPInput.tsx
@@ -1,7 +1,7 @@
 import { useState, useEffect } from 'react';
 import { useFormContext, Controller } from 'react-hook-form';
 import type { MCP } from 'librechat-data-provider';
-import MCPAuth from '~/components/SidePanel/Builder/MCPAuth';
+import { MCPAuth } from '~/components/SidePanel/MCP/MCPAuth';
 import MCPIcon from '~/components/SidePanel/Agents/MCPIcon';
 import { Label, Checkbox } from '~/components/ui';
 import useLocalize from '~/hooks/useLocalize';
diff --git a/client/src/components/SidePanel/Builder/MCP.tsx b/client/src/components/SidePanel/MCP/MCPItem.tsx
similarity index 97%
rename from client/src/components/SidePanel/Builder/MCP.tsx
rename to client/src/components/SidePanel/MCP/MCPItem.tsx
index f632b6c00d..354dfba268 100644
--- a/client/src/components/SidePanel/Builder/MCP.tsx
+++ b/client/src/components/SidePanel/MCP/MCPItem.tsx
@@ -9,7 +9,7 @@ type MCPProps = {
   onClick: () => void;
 };
 
-export default function MCP({ mcp, onClick }: MCPProps) {
+export function MCPItem({ mcp, onClick }: MCPProps) {
   const [isHovering, setIsHovering] = useState(false);
 
   return (