diff --git a/src/agents/openclaw-tools.ts b/src/agents/openclaw-tools.ts
index 6dc694c6350..1116982ff2e 100644
--- a/src/agents/openclaw-tools.ts
+++ b/src/agents/openclaw-tools.ts
@@ -80,6 +80,12 @@ export function createOpenClawTools(options?: {
     ? createImageTool({
         config: options?.config,
         agentDir: options.agentDir,
+        agentId:
+          options?.requesterAgentIdOverride ??
+          resolveSessionAgentId({
+            sessionKey: options?.agentSessionKey,
+            config: options?.config,
+          }),
         workspaceDir,
         sandbox:
           options?.sandboxRoot && options?.sandboxFsBridge
@@ -113,6 +119,7 @@ export function createOpenClawTools(options?: {
     ? null
     : createMessageTool({
         agentAccountId: options?.agentAccountId,
+        agentId: options?.requesterAgentIdOverride,
         agentSessionKey: options?.agentSessionKey,
         config: options?.config,
         currentChannelId: options?.currentChannelId,