From 5d57c6bfa3575b1dcc404978f5738c383666bf3e Mon Sep 17 00:00:00 2001
From: mateo-berri <277851410+mateo-berri@users.noreply.github.com>
Date: Wed, 20 May 2026 19:04:16 -0700
Subject: [PATCH] fix: prevent phantom "Unnamed Server" view after deleting MCP
 server

- Reset selectedServerId and editServer state when deleting the currently
  viewed MCP server to return user to the server list
- Avoids the detail view remaining mounted with an empty stub server after deletion
---
 .../src/components/mcp_tools/mcp_servers.tsx              | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/ui/litellm-dashboard/src/components/mcp_tools/mcp_servers.tsx b/ui/litellm-dashboard/src/components/mcp_tools/mcp_servers.tsx
index a2d2b93e80a..729986cdfc6 100644
--- a/ui/litellm-dashboard/src/components/mcp_tools/mcp_servers.tsx
+++ b/ui/litellm-dashboard/src/components/mcp_tools/mcp_servers.tsx
@@ -267,6 +267,14 @@ const MCPServers: React.FC<MCPServerProps> = ({ accessToken, userRole, userID })
       setIsDeletingServer(true);
       await deleteMCPServer(accessToken, serverIdToDelete);
       NotificationsManager.success("Deleted MCP Server successfully");
+      // If the user is currently viewing the detail page of the server they
+      // just deleted, return them to the All Servers list. Otherwise the
+      // detail view would stay mounted, fall back to an empty stub server,
+      // and show a phantom "Unnamed Server" page.
+      if (selectedServerId === serverIdToDelete) {
+        setEditServer(false);
+        setSelectedServerId(null);
+      }
       refetch();
     } catch (error) {
       console.error("Error deleting the mcp server:", error);