diff --git a/apps/server/src/routes/mcp/routes/list-tools.ts b/apps/server/src/routes/mcp/routes/list-tools.ts
index ac1d0e84..d380d8b3 100644
--- a/apps/server/src/routes/mcp/routes/list-tools.ts
+++ b/apps/server/src/routes/mcp/routes/list-tools.ts
@@ -37,18 +37,10 @@ export function createListToolsHandler(mcpTestService: MCPTestService) {
         return;
       }
 
-      let result;
-      if (body.serverId) {
-        result = await mcpTestService.testServerById(body.serverId);
-      } else if (body.serverConfig) {
-        result = await mcpTestService.testServer(body.serverConfig);
-      } else {
-        res.status(400).json({
-          success: false,
-          error: 'Invalid request',
-        });
-        return;
-      }
+      // At this point, we know at least one of serverId or serverConfig is truthy
+      const result = body.serverId
+        ? await mcpTestService.testServerById(body.serverId)
+        : await mcpTestService.testServer(body.serverConfig!);
 
       // Return only tool-related information
       res.json({
diff --git a/apps/server/src/routes/mcp/routes/test-server.ts b/apps/server/src/routes/mcp/routes/test-server.ts
index 8106dff1..2240fafc 100644
--- a/apps/server/src/routes/mcp/routes/test-server.ts
+++ b/apps/server/src/routes/mcp/routes/test-server.ts
@@ -37,18 +37,10 @@ export function createTestServerHandler(mcpTestService: MCPTestService) {
         return;
       }
 
-      let result;
-      if (body.serverId) {
-        result = await mcpTestService.testServerById(body.serverId);
-      } else if (body.serverConfig) {
-        result = await mcpTestService.testServer(body.serverConfig);
-      } else {
-        res.status(400).json({
-          success: false,
-          error: 'Invalid request',
-        });
-        return;
-      }
+      // At this point, we know at least one of serverId or serverConfig is truthy
+      const result = body.serverId
+        ? await mcpTestService.testServerById(body.serverId)
+        : await mcpTestService.testServer(body.serverConfig!);
 
       res.json(result);
     } catch (error) {