diff --git a/packages/api/src/engine/agent-runner.service.ts b/packages/api/src/engine/agent-runner.service.ts
index 9012e1d..0588de9 100644
--- a/packages/api/src/engine/agent-runner.service.ts
+++ b/packages/api/src/engine/agent-runner.service.ts
@@ -528,10 +528,10 @@ export class AgentRunnerService {
         maxConcurrentPythonRuns: policy.maxConcurrentPythonRuns,
       };
 
-      if (policy.allowPython && workspacePaths !== undefined && session !== null) {
+      if (policy.allowPython && workspacePaths !== undefined) {
         registry.register(
           createPythonRunTool({
-            sessionId: session.id,
+            sessionId: session?.id ?? `agentrun-${agentRun.id}`,
             userId,
             workspaceHostPath: workspacePaths.hostPath,
             policy: pythonPolicy,