diff --git a/src/auto-reply/reply/commands-session-abort.ts b/src/auto-reply/reply/commands-session-abort.ts
index d599e6dc131..1f50212caf3 100644
--- a/src/auto-reply/reply/commands-session-abort.ts
+++ b/src/auto-reply/reply/commands-session-abort.ts
@@ -153,7 +153,7 @@ export const handleStopCommand: CommandHandler = async (params, allowTextCommand
     "stop",
     abortTarget.key ?? params.sessionKey ?? "",
     {
-      sessionEntry: abortTarget.entry ?? params.sessionEntry,
+      sessionEntry: abortTarget.entry,
       sessionId: abortTarget.sessionId,
       commandSource: params.command.surface,
       senderId: params.command.senderId,
diff --git a/src/auto-reply/reply/commands-stop-target.test.ts b/src/auto-reply/reply/commands-stop-target.test.ts
index b677cfcc44f..10a3233ba9f 100644
--- a/src/auto-reply/reply/commands-stop-target.test.ts
+++ b/src/auto-reply/reply/commands-stop-target.test.ts
@@ -4,6 +4,7 @@ import { handleStopCommand } from "./commands-session-abort.js";
 import type { HandleCommandsParams } from "./commands-types.js";
 
 const abortEmbeddedPiRunMock = vi.hoisted(() => vi.fn());
+const createInternalHookEventMock = vi.hoisted(() => vi.fn(() => ({})));
 const persistAbortTargetEntryMock = vi.hoisted(() => vi.fn(async () => true));
 const replyRunAbortMock = vi.hoisted(() => vi.fn());
 const resolveSessionIdMock = vi.hoisted(() => vi.fn(() => undefined));
@@ -18,7 +19,7 @@ vi.mock("../../globals.js", () => ({
 }));
 
 vi.mock("../../hooks/internal-hooks.js", () => ({
-  createInternalHookEvent: vi.fn(() => ({})),
+  createInternalHookEvent: createInternalHookEventMock,
   triggerInternalHook: vi.fn(async () => undefined),
 }));
 
@@ -113,5 +114,13 @@ describe("handleStopCommand target fallback", () => {
         requesterSessionKey: "agent:target:telegram:direct:123",
       }),
     );
+    expect(createInternalHookEventMock).toHaveBeenCalledWith(
+      "command",
+      "stop",
+      "agent:target:telegram:direct:123",
+      expect.objectContaining({
+        sessionEntry: undefined,
+      }),
+    );
   });
 });