diff --git a/core/src/main/java/com/google/adk/tools/AgentTool.java b/core/src/main/java/com/google/adk/tools/AgentTool.java
index 66d4a2700..953600d05 100644
--- a/core/src/main/java/com/google/adk/tools/AgentTool.java
+++ b/core/src/main/java/com/google/adk/tools/AgentTool.java
@@ -181,7 +181,11 @@ public Single<Map<String, Object>> runAsync(Map<String, Object> args, ToolContex
     Runner runner = new InMemoryRunner(this.agent, toolContext.agentName(), plugins);
     return runner
         .sessionService()
-        .createSession(toolContext.agentName(), "tmp-user", toolContext.state(), null)
+        .createSession(
+            toolContext.agentName(),
+            toolContext.userId(),
+            (Map<String, Object>) toolContext.state(),
+            null)
         .flatMapPublisher(session -> runner.runAsync(session.userId(), session.id(), content))
         .doOnNext(
             event -> {