diff --git a/ui/litellm-dashboard/src/components/mcp_tools/create_mcp_server.tsx b/ui/litellm-dashboard/src/components/mcp_tools/create_mcp_server.tsx index dbafe41f994..5867bca2d59 100644 --- a/ui/litellm-dashboard/src/components/mcp_tools/create_mcp_server.tsx +++ b/ui/litellm-dashboard/src/components/mcp_tools/create_mcp_server.tsx @@ -297,9 +297,10 @@ const CreateMCPServer: React.FC = ({ setTransportType(transport); const copySuffix = "_copy"; - const baseName = duplicateServer.server_name || duplicateServer.alias || ""; + const baseName = (duplicateServer.server_name || duplicateServer.alias || "").replace(/_copy$/, ""); + const baseAlias = (duplicateServer.alias || duplicateServer.server_name || "").replace(/_copy$/, ""); const newName = baseName + copySuffix; - const newAlias = (duplicateServer.alias || baseName) + copySuffix; + const newAlias = baseAlias + copySuffix; const prefillValues: Record = { server_name: newName,