From b10501ea79fc7d9e4b3ebafff724eee51d9e749b Mon Sep 17 00:00:00 2001
From: Noam Loewenstern <noam.l@ocean.security>
Date: Fri, 30 Jan 2026 02:44:51 +0200
Subject: [PATCH] fix(ui): handle null selectedWorktree in max concurrency
 handler

---
 apps/ui/src/components/views/board-view.tsx | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/apps/ui/src/components/views/board-view.tsx b/apps/ui/src/components/views/board-view.tsx
index 2624514a..64c4d287 100644
--- a/apps/ui/src/components/views/board-view.tsx
+++ b/apps/ui/src/components/views/board-view.tsx
@@ -1274,8 +1274,11 @@ export function BoardView() {
         maxConcurrency={maxConcurrency}
         runningAgentsCount={runningAutoTasks.length}
         onConcurrencyChange={(newMaxConcurrency) => {
-          if (currentProject && selectedWorktree) {
-            const branchName = selectedWorktree.isMain ? null : selectedWorktree.branch;
+          if (currentProject) {
+            // If selectedWorktree is undefined, fallback to null (main/primary worktree)
+            // Use null for the main worktree, otherwise use the branch name; also null if no worktree selected
+            const branchName =
+              selectedWorktree && !selectedWorktree.isMain ? selectedWorktree.branch : null;
             setMaxConcurrencyForWorktree(currentProject.id, branchName, newMaxConcurrency);
             // Also update backend if auto mode is running
             if (autoMode.isRunning) {