diff --git a/app/tool/mcp.py b/app/tool/mcp.py
index 32fa8249e..1132aca2b 100644
--- a/app/tool/mcp.py
+++ b/app/tool/mcp.py
@@ -140,7 +140,7 @@ def _sanitize_tool_name(self, name: str) -> str:
 
         # Truncate to 64 characters if needed
         if len(sanitized) > 64:
-            sanitized = sanitized[:64]
+            sanitized = 'mcp_' + sanitized[-60:]
 
         return sanitized