diff --git a/src/pages/Setting/MCP.tsx b/src/pages/Setting/MCP.tsx
index a95c62571..ef1eabe14 100644
--- a/src/pages/Setting/MCP.tsx
+++ b/src/pages/Setting/MCP.tsx
@@ -286,9 +286,9 @@ export default function SettingMCP() {
 				}
 				if (window.ipcRenderer) {
 					const mcpServers = data["mcpServers"];
-					Object.entries(mcpServers).forEach(async ([key, value]) => {
+					for (const [key, value] of Object.entries(mcpServers)) {
 						await window.ipcRenderer.invoke("mcp-install", key, value);
-					});
+					}
 				}
 			}
 			setShowAdd(false);
diff --git a/src/pages/Setting/components/MCPList.tsx b/src/pages/Setting/components/MCPList.tsx
index 04199e261..a2fa73ca9 100644
--- a/src/pages/Setting/components/MCPList.tsx
+++ b/src/pages/Setting/components/MCPList.tsx
@@ -12,9 +12,9 @@ interface MCPListProps {
 export default function MCPList({ items, onSetting, onDelete, onSwitch, switchLoading }: MCPListProps) {
   return (
     <div className='pt-4'>
-      {items.map((item, index) => (
+      {items.map((item) => (
         <MCPListItem
-          key={index}
+          key={item.id}
           item={item}
           onSetting={onSetting}
           onDelete={onDelete}