diff --git a/server/src/__tests__/heartbeat-workspace-session.test.ts b/server/src/__tests__/heartbeat-workspace-session.test.ts
index 67536fe9..9a34402a 100644
--- a/server/src/__tests__/heartbeat-workspace-session.test.ts
+++ b/server/src/__tests__/heartbeat-workspace-session.test.ts
@@ -93,22 +93,22 @@ describe("shouldResetTaskSessionForWake", () => {
     expect(shouldResetTaskSessionForWake({ wakeReason: "issue_assigned" })).toBe(true);
   });
 
-  it("resets session context on mention wake comment", () => {
+  it("does not reset session context on mention wake comment", () => {
     expect(
       shouldResetTaskSessionForWake({
         wakeReason: "issue_comment_mentioned",
         wakeCommentId: "comment-1",
       }),
-    ).toBe(true);
+    ).toBe(false);
   });
 
-  it("resets session context when commentId is present", () => {
+  it("does not reset session context when commentId is present", () => {
     expect(
       shouldResetTaskSessionForWake({
         wakeReason: "issue_commented",
         commentId: "comment-2",
       }),
-    ).toBe(true);
+    ).toBe(false);
   });
 
   it("does not reset for comment wakes", () => {
diff --git a/server/src/services/heartbeat.ts b/server/src/services/heartbeat.ts
index 3ea9421f..88155bbc 100644
--- a/server/src/services/heartbeat.ts
+++ b/server/src/services/heartbeat.ts
@@ -199,11 +199,7 @@ export function shouldResetTaskSessionForWake(
   contextSnapshot: Record<string, unknown> | null | undefined,
 ) {
   const wakeReason = readNonEmptyString(contextSnapshot?.wakeReason);
-  if (wakeReason === "issue_assigned") return true;
-  const wakeCommentId =
-    readNonEmptyString(contextSnapshot?.wakeCommentId) ??
-    readNonEmptyString(contextSnapshot?.commentId);
-  return wakeCommentId != null;
+  return wakeReason === "issue_assigned";
 }
 
 function deriveCommentId(