diff --git a/tools/server/webui/src/lib/components/app/mcp/McpServerCard/McpServerCard.svelte b/tools/server/webui/src/lib/components/app/mcp/McpServerCard/McpServerCard.svelte
index 9af2d96914..9ea9ed9f36 100644
--- a/tools/server/webui/src/lib/components/app/mcp/McpServerCard/McpServerCard.svelte
+++ b/tools/server/webui/src/lib/components/app/mcp/McpServerCard/McpServerCard.svelte
@@ -110,6 +110,7 @@
 			{displayName}
 			{faviconUrl}
 			enabled={enabled ?? server.enabled}
+			disabled={isError}
 			{onToggle}
 			{serverInfo}
 			{capabilities}
diff --git a/tools/server/webui/src/lib/components/app/mcp/McpServerCard/McpServerCardHeader.svelte b/tools/server/webui/src/lib/components/app/mcp/McpServerCard/McpServerCardHeader.svelte
index 3a4bfa7fda..6c3e418ad7 100644
--- a/tools/server/webui/src/lib/components/app/mcp/McpServerCard/McpServerCardHeader.svelte
+++ b/tools/server/webui/src/lib/components/app/mcp/McpServerCard/McpServerCardHeader.svelte
@@ -10,6 +10,7 @@
 		displayName: string;
 		faviconUrl: string | null;
 		enabled: boolean;
+		disabled?: boolean;
 		onToggle: (enabled: boolean) => void;
 		serverInfo?: MCPServerInfo;
 		capabilities?: MCPCapabilitiesInfo;
@@ -20,6 +21,7 @@
 		displayName,
 		faviconUrl,
 		enabled,
+		disabled = false,
 		onToggle,
 		serverInfo,
 		capabilities,
@@ -100,7 +102,7 @@
 		</div>
 
 		<div class="flex shrink-0 items-center pl-2">
-			<Switch checked={enabled} onCheckedChange={onToggle} />
+			<Switch checked={enabled} {disabled} onCheckedChange={onToggle} />
 		</div>
 	</div>
 </div>