diff --git a/src/components/AddWorker/ToolSelect.tsx b/src/components/AddWorker/ToolSelect.tsx
index d2be3cd55..727aa6bf9 100644
--- a/src/components/AddWorker/ToolSelect.tsx
+++ b/src/components/AddWorker/ToolSelect.tsx
@@ -630,7 +630,7 @@ const ToolSelect = forwardRef<
 					key={item.id + item.key + (item.isLocal + "")}
 					className="h-5 bg-button-tertiery-fill-default flex items-center gap-1 w-auto flex-shrink-0 px-xs"
 				>
-					{item.name || item.mcp_name || item.key || "Unknown Tool"}
+					{item.name || item.mcp_name || item.key || `tool_${item.id}`}
 					<div className="flex items-center justify-center bg-button-secondary-fill-disabled rounded-sm">
 						<X
 							className="w-4 h-4 cursor-pointer text-button-secondary-icon-disabled"
diff --git a/src/components/AddWorker/index.tsx b/src/components/AddWorker/index.tsx
index 6f1ec63f3..f824903a5 100644
--- a/src/components/AddWorker/index.tsx
+++ b/src/components/AddWorker/index.tsx
@@ -282,7 +282,7 @@ export function AddWorker({
 						name: workerName,
 						type: workerName as AgentNameType,
 						log: [],
-						tools: [...selectedTools.map((tool) => tool.name || tool.mcp_name || tool.key || "Unknown Tool")],
+						tools: [...selectedTools.map((tool) => tool.name || tool.mcp_name || tool.key || `tool_${tool.id}`)],
 						activeWebviewIds: [],
 						workerInfo: {
 							name: workerName,