diff --git a/src/renderer/src/pages/settings/MCPSettings/EditMcpJsonPopup.tsx b/src/renderer/src/pages/settings/MCPSettings/EditMcpJsonPopup.tsx
index bc9a9463..dc2b20a3 100644
--- a/src/renderer/src/pages/settings/MCPSettings/EditMcpJsonPopup.tsx
+++ b/src/renderer/src/pages/settings/MCPSettings/EditMcpJsonPopup.tsx
@@ -69,6 +69,11 @@ const PopupContainer: React.FC<Props> = ({ resolve }) => {
           isActive: false,
           ...(serverConfig as any)
         }
+
+        if (!server.name) {
+          server.name = id
+        }
+
         serversArray.push(server)
       }
 
diff --git a/src/renderer/src/pages/settings/MCPSettings/McpSettings.tsx b/src/renderer/src/pages/settings/MCPSettings/McpSettings.tsx
index c4bd2e76..cc321904 100644
--- a/src/renderer/src/pages/settings/MCPSettings/McpSettings.tsx
+++ b/src/renderer/src/pages/settings/MCPSettings/McpSettings.tsx
@@ -261,8 +261,8 @@ const McpSettings: React.FC<Props> = ({ server }) => {
             <Radio.Group
               onChange={(e) => setServerType(e.target.value)}
               options={[
-                { label: 'SSE', value: 'sse' },
-                { label: 'STDIO', value: 'stdio' }
+                { label: 'STDIO', value: 'stdio' },
+                { label: 'SSE', value: 'sse' }
               ]}
             />
           </Form.Item>