diff --git a/packages/core/src/services/sessionService.ts b/packages/core/src/services/sessionService.ts
index 9566d306ff..9a32012681 100644
--- a/packages/core/src/services/sessionService.ts
+++ b/packages/core/src/services/sessionService.ts
@@ -1025,7 +1025,13 @@ export class SessionService {
     }
 
     // Reconstruct linear history
+    const leafUuid = this.lastConversationRecordUuid(records);
+    if (!leafUuid) {
+      return;
+    }
+
     const { messages, gaps } = this.reconstructHistory(records, {
+      leafUuid,
       detectGaps: true,
     });
     if (messages.length === 0) {