diff --git a/src/agents/pi-embedded-runner/run.attempt-param-forwarding.test.ts b/src/agents/pi-embedded-runner/run.attempt-param-forwarding.test.ts
index 36a917ceeb9..f38ef01bf46 100644
--- a/src/agents/pi-embedded-runner/run.attempt-param-forwarding.test.ts
+++ b/src/agents/pi-embedded-runner/run.attempt-param-forwarding.test.ts
@@ -24,6 +24,7 @@ const forwardingCase = {
     bootstrapContextMode: "lightweight",
     bootstrapContextRunKind: "cron",
     disableMessageTool: true,
+    forceMessageTool: true,
     requireExplicitMessageTarget: true,
     internalEvents,
   },
@@ -32,6 +33,7 @@ const forwardingCase = {
     bootstrapContextMode: "lightweight",
     bootstrapContextRunKind: "cron",
     disableMessageTool: true,
+    forceMessageTool: true,
     requireExplicitMessageTarget: true,
     internalEvents,
   },
diff --git a/src/agents/pi-embedded-runner/run.ts b/src/agents/pi-embedded-runner/run.ts
index 9dd358a3df2..acfa1cf9674 100644
--- a/src/agents/pi-embedded-runner/run.ts
+++ b/src/agents/pi-embedded-runner/run.ts
@@ -777,6 +777,7 @@ export async function runEmbeddedPiAgent(
             bootstrapContextRunKind: params.bootstrapContextRunKind,
             toolsAllow: params.toolsAllow,
             disableMessageTool: params.disableMessageTool,
+            forceMessageTool: params.forceMessageTool,
             requireExplicitMessageTarget: params.requireExplicitMessageTarget,
             internalEvents: params.internalEvents,
             bootstrapPromptWarningSignaturesSeen,