From d9dfceddf82168d38ab8086577372184cb837c50 Mon Sep 17 00:00:00 2001
From: Luke Parker <10430890+Hona@users.noreply.github.com>
Date: Sun, 16 Aug 2026 08:19:06 +1000
Subject: [PATCH] fix(app): release virtualized timeline elements (#42825)

---
 packages/app/src/pages/session/timeline/message-timeline.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/app/src/pages/session/timeline/message-timeline.tsx b/packages/app/src/pages/session/timeline/message-timeline.tsx
index 9a0a3f61d5c..48066f73eb8 100644
--- a/packages/app/src/pages/session/timeline/message-timeline.tsx
+++ b/packages/app/src/pages/session/timeline/message-timeline.tsx
@@ -1203,6 +1203,8 @@ function MessageTimelineView(
 
     onCleanup(() => {
       if (contentMeasureFrame !== undefined) cancelAnimationFrame(contentMeasureFrame)
+      // Solid runs cleanup before it disconnects the row, so defer TanStack's null-ref cleanup.
+      queueMicrotask(() => virtualizer.measureElement(null))
     })
 
     return (