diff --git a/ui/litellm-dashboard/src/components/mcp_tools/utils.tsx b/ui/litellm-dashboard/src/components/mcp_tools/utils.tsx
index 1d6ae540434..0039ccc62ba 100644
--- a/ui/litellm-dashboard/src/components/mcp_tools/utils.tsx
+++ b/ui/litellm-dashboard/src/components/mcp_tools/utils.tsx
@@ -47,15 +47,7 @@ export const validateMCPServerUrl = (value: string) => {
 };
 
 export const validateMCPServerName = (value: string) => {
-  if (!value) return Promise.resolve();
-  
-  if (value.includes("-")) {
-    return Promise.reject("Server name cannot contain '-' (hyphen). Please use '_' (underscore) instead.");
-  }
-  
-  if (value.includes(" ")) {
-    return Promise.reject("Server name cannot contain spaces. Please use '_' (underscore) instead.");
-  }
-  
-  return Promise.resolve();
+  return value && (value.includes("-") || value.includes(" "))
+    ? Promise.reject("Server name cannot contain '-' (hyphen) or spaces. Please use '_' (underscore) instead.")
+    : Promise.resolve();
 };