diff --git a/doc/SPEC-implementation.md b/doc/SPEC-implementation.md
index 02b8e783cbe..22075e0453a 100644
--- a/doc/SPEC-implementation.md
+++ b/doc/SPEC-implementation.md
@@ -676,7 +676,7 @@ Per-agent schedule fields in `adapter_config`:
 
 - `enabled` boolean
 - `intervalSec` integer (minimum 30)
-- `maxConcurrentRuns` integer; new agents default to `20`
+- `maxConcurrentRuns` integer; new agents default to `20`; scheduler clamps configured values to `1..50`
 
 Scheduler must skip invocation when:
 
diff --git a/server/src/services/heartbeat.ts b/server/src/services/heartbeat.ts
index 119002c07fd..41383f6f29f 100644
--- a/server/src/services/heartbeat.ts
+++ b/server/src/services/heartbeat.ts
@@ -145,7 +145,7 @@ const MAX_RUN_EVENT_PAYLOAD_OBJECT_KEYS = 100;
 const MAX_RUN_EVENT_PAYLOAD_DEPTH = 6;
 const HEARTBEAT_MAX_CONCURRENT_RUNS_DEFAULT = AGENT_DEFAULT_MAX_CONCURRENT_RUNS;
 const HEARTBEAT_MAX_CONCURRENT_RUNS_MIN = 1;
-const HEARTBEAT_MAX_CONCURRENT_RUNS_MAX = 20;
+const HEARTBEAT_MAX_CONCURRENT_RUNS_MAX = 50;
 const LIVENESS_BOOKKEEPING_ACTIVITY_ACTIONS = [
   "environment.lease_acquired",
   "environment.lease_released",
diff --git a/ui/src/lib/new-agent-runtime-config.test.ts b/ui/src/lib/new-agent-runtime-config.test.ts
index f33cdc8538a..3a72943c3f2 100644
--- a/ui/src/lib/new-agent-runtime-config.test.ts
+++ b/ui/src/lib/new-agent-runtime-config.test.ts
@@ -1,5 +1,6 @@
 // @vitest-environment node
 import { describe, expect, it } from "vitest";
+import { AGENT_DEFAULT_MAX_CONCURRENT_RUNS } from "@paperclipai/shared";
 import { buildNewAgentRuntimeConfig } from "./new-agent-runtime-config";
 
 describe("buildNewAgentRuntimeConfig", () => {
@@ -10,7 +11,7 @@ describe("buildNewAgentRuntimeConfig", () => {
         intervalSec: 300,
         wakeOnDemand: true,
         cooldownSec: 10,
-        maxConcurrentRuns: 5,
+        maxConcurrentRuns: AGENT_DEFAULT_MAX_CONCURRENT_RUNS,
       },
     });
   });
@@ -27,7 +28,7 @@ describe("buildNewAgentRuntimeConfig", () => {
         intervalSec: 3600,
         wakeOnDemand: true,
         cooldownSec: 10,
-        maxConcurrentRuns: 5,
+        maxConcurrentRuns: AGENT_DEFAULT_MAX_CONCURRENT_RUNS,
       },
     });
   });