diff --git a/src/QueryEngine.ts b/src/QueryEngine.ts
index db5732489..6704dac68 100644
--- a/src/QueryEngine.ts
+++ b/src/QueryEngine.ts
@@ -837,14 +837,12 @@ export class QueryEngine {
             )
           }
 
-          if (includePartialMessages) {
-            yield {
-              type: 'stream_event' as const,
-              event,
-              session_id: getSessionId(),
-              parent_tool_use_id: null,
-              uuid: randomUUID(),
-            }
+          yield {
+            type: 'stream_event' as const,
+            event,
+            session_id: getSessionId(),
+            parent_tool_use_id: null,
+            uuid: randomUUID(),
           }
 
           break
diff --git a/src/server/sessionHandle.ts b/src/server/sessionHandle.ts
index 93749dbf0..638115db5 100644
--- a/src/server/sessionHandle.ts
+++ b/src/server/sessionHandle.ts
@@ -521,6 +521,11 @@ export class SessionHandle {
         this.pendingQuestions.delete(cancelRequestId)
         break
       }
+      case 'stream_event': {
+        this.lastActiveAt = Date.now()
+        this.emitEvent('stream_event', msg)
+        break
+      }
       default: {
         break
       }