diff --git a/web/src/app/_settings/tabs/mcp-tab.tsx b/web/src/app/_settings/tabs/mcp-tab.tsx
index 1b177c8..a2449bf 100644
--- a/web/src/app/_settings/tabs/mcp-tab.tsx
+++ b/web/src/app/_settings/tabs/mcp-tab.tsx
@@ -7,6 +7,7 @@ import { useCallback, useState } from "react";
 
 import { Tooltip } from "~/app/_components/tooltip";
 import { Button } from "~/components/ui/button";
+import { Switch } from "~/components/ui/switch";
 import type { MCPServerMetadata } from "~/core/mcp";
 
 import { AddMCPServerDialog } from "../dialogs/add-mcp-server-dialog";
@@ -46,6 +47,16 @@ export const MCPTab: Tab = ({ settings, onChange }) => {
     },
     [onChange, settings],
   );
+  const handleToggleServer = useCallback(
+    (name: string, enabled: boolean) => {
+      const merged = settings.mcp.servers.map((server) =>
+        server.name === name ? { ...server, enabled } : server,
+      );
+      setServers(merged);
+      onChange({ ...settings, mcp: { ...settings.mcp, servers: merged } });
+    },
+    [onChange, settings],
+  );
   const animationProps = {
     initial: { backgroundColor: "gray" },
     animate: { backgroundColor: "transparent" },
@@ -86,7 +97,20 @@ export const MCPTab: Tab = ({ settings, onChange }) => {
                 key={server.name}
                 {...(isNew && newlyAdded && animationProps)}
               >
-                <div className="absolute top-1 right-2 opacity-0 transition-opacity duration-300 group-hover:opacity-100">
+                <div className="absolute top-3 right-2">
+                  <Tooltip title="Enable/disable server">
+                    <div className="flex items-center gap-2">
+                      <Switch
+                        id="airplane-mode"
+                        checked={server.enabled}
+                        onCheckedChange={(checked) => {
+                          handleToggleServer(server.name, checked);
+                        }}
+                      />
+                    </div>
+                  </Tooltip>
+                </div>
+                <div className="absolute top-1 right-12 opacity-0 transition-opacity duration-300 group-hover:opacity-100">
                   <Tooltip title="Delete server">
                     <Button
                       variant="ghost"