diff --git a/packages/mcp/src/tools/devices/create-workspace/create-workspace.ts b/packages/mcp/src/tools/devices/create-workspace/create-workspace.ts
index 4df76b9931d..28fdf67f1d4 100644
--- a/packages/mcp/src/tools/devices/create-workspace/create-workspace.ts
+++ b/packages/mcp/src/tools/devices/create-workspace/create-workspace.ts
@@ -41,18 +41,6 @@ export function register(server: McpServer) {
 				typeof workspaceInputSchema
 			>[];
 
-			if (!deviceId || !projectId) {
-				return {
-					content: [
-						{
-							type: "text",
-							text: "Error: deviceId and projectId are required",
-						},
-					],
-					isError: true,
-				};
-			}
-
 			return executeOnDevice({
 				ctx,
 				deviceId,
diff --git a/packages/mcp/src/tools/devices/delete-workspace/delete-workspace.ts b/packages/mcp/src/tools/devices/delete-workspace/delete-workspace.ts
index 34289513dcb..079356f2708 100644
--- a/packages/mcp/src/tools/devices/delete-workspace/delete-workspace.ts
+++ b/packages/mcp/src/tools/devices/delete-workspace/delete-workspace.ts
@@ -21,13 +21,6 @@ export function register(server: McpServer) {
 			const deviceId = args.deviceId as string;
 			const workspaceIds = args.workspaceIds as string[];
 
-			if (!deviceId) {
-				return {
-					content: [{ type: "text", text: "Error: deviceId is required" }],
-					isError: true,
-				};
-			}
-
 			return executeOnDevice({
 				ctx,
 				deviceId,
diff --git a/packages/mcp/src/tools/devices/get-app-context/get-app-context.ts b/packages/mcp/src/tools/devices/get-app-context/get-app-context.ts
index ff6a430c911..779b854d0c5 100644
--- a/packages/mcp/src/tools/devices/get-app-context/get-app-context.ts
+++ b/packages/mcp/src/tools/devices/get-app-context/get-app-context.ts
@@ -16,13 +16,6 @@ export function register(server: McpServer) {
 			const ctx = getMcpContext(extra);
 			const deviceId = args.deviceId as string;
 
-			if (!deviceId) {
-				return {
-					content: [{ type: "text", text: "Error: deviceId is required" }],
-					isError: true,
-				};
-			}
-
 			return executeOnDevice({
 				ctx,
 				deviceId,
diff --git a/packages/mcp/src/tools/devices/list-projects/list-projects.ts b/packages/mcp/src/tools/devices/list-projects/list-projects.ts
index fb85bdda652..b55a6e0f1a6 100644
--- a/packages/mcp/src/tools/devices/list-projects/list-projects.ts
+++ b/packages/mcp/src/tools/devices/list-projects/list-projects.ts
@@ -15,13 +15,6 @@ export function register(server: McpServer) {
 			const ctx = getMcpContext(extra);
 			const deviceId = args.deviceId as string;
 
-			if (!deviceId) {
-				return {
-					content: [{ type: "text", text: "Error: deviceId is required" }],
-					isError: true,
-				};
-			}
-
 			return executeOnDevice({
 				ctx,
 				deviceId,
diff --git a/packages/mcp/src/tools/devices/list-workspaces/list-workspaces.ts b/packages/mcp/src/tools/devices/list-workspaces/list-workspaces.ts
index 4cd47f85711..8fe138beb4d 100644
--- a/packages/mcp/src/tools/devices/list-workspaces/list-workspaces.ts
+++ b/packages/mcp/src/tools/devices/list-workspaces/list-workspaces.ts
@@ -15,13 +15,6 @@ export function register(server: McpServer) {
 			const ctx = getMcpContext(extra);
 			const deviceId = args.deviceId as string;
 
-			if (!deviceId) {
-				return {
-					content: [{ type: "text", text: "Error: deviceId is required" }],
-					isError: true,
-				};
-			}
-
 			return executeOnDevice({
 				ctx,
 				deviceId,
diff --git a/packages/mcp/src/tools/devices/navigate-to-workspace/navigate-to-workspace.ts b/packages/mcp/src/tools/devices/navigate-to-workspace/navigate-to-workspace.ts
index 19af18eb968..c50255e2248 100644
--- a/packages/mcp/src/tools/devices/navigate-to-workspace/navigate-to-workspace.ts
+++ b/packages/mcp/src/tools/devices/navigate-to-workspace/navigate-to-workspace.ts
@@ -26,13 +26,6 @@ export function register(server: McpServer) {
 			const workspaceId = args.workspaceId as string | undefined;
 			const workspaceName = args.workspaceName as string | undefined;
 
-			if (!deviceId) {
-				return {
-					content: [{ type: "text", text: "Error: deviceId is required" }],
-					isError: true,
-				};
-			}
-
 			if (!workspaceId && !workspaceName) {
 				return {
 					content: [
diff --git a/packages/mcp/src/tools/devices/switch-workspace/switch-workspace.ts b/packages/mcp/src/tools/devices/switch-workspace/switch-workspace.ts
index 8b216b8c0eb..554cc8a85a6 100644
--- a/packages/mcp/src/tools/devices/switch-workspace/switch-workspace.ts
+++ b/packages/mcp/src/tools/devices/switch-workspace/switch-workspace.ts
@@ -26,13 +26,6 @@ export function register(server: McpServer) {
 			const workspaceId = args.workspaceId as string | undefined;
 			const workspaceName = args.workspaceName as string | undefined;
 
-			if (!deviceId) {
-				return {
-					content: [{ type: "text", text: "Error: deviceId is required" }],
-					isError: true,
-				};
-			}
-
 			if (!workspaceId && !workspaceName) {
 				return {
 					content: [
diff --git a/packages/mcp/src/tools/devices/update-workspace/update-workspace.ts b/packages/mcp/src/tools/devices/update-workspace/update-workspace.ts
index f59b75b6f4a..0e740ed0740 100644
--- a/packages/mcp/src/tools/devices/update-workspace/update-workspace.ts
+++ b/packages/mcp/src/tools/devices/update-workspace/update-workspace.ts
@@ -27,13 +27,6 @@ export function register(server: McpServer) {
 			const deviceId = args.deviceId as string;
 			const updates = args.updates as z.infer<typeof workspaceUpdateSchema>[];
 
-			if (!deviceId) {
-				return {
-					content: [{ type: "text", text: "Error: deviceId is required" }],
-					isError: true,
-				};
-			}
-
 			return executeOnDevice({
 				ctx,
 				deviceId,