1 files changed, 10 insertions, 13 deletions
diff --git a/packages/ui/src/components/session-turn.tsx b/packages/ui/src/components/session-turn.tsx
index 0a1ee5c4f..a3ac5b0b4 100644
--- a/packages/ui/src/components/session-turn.tsx
+++ b/packages/ui/src/components/session-turn.tsx
@@ -111,23 +111,13 @@ export function SessionTurn(
 
   const allMessages = createMemo(() => data.store.message[props.sessionID] ?? [])
 
-  const messageIndex = createMemo(() => {
+  const message = createMemo(() => {
     const messages = allMessages()
     const result = Binary.search(messages, props.messageID, (m) => m.id)
-    if (!result.found) return -1
+    if (!result.found) return undefined
 
     const msg = messages[result.index]
-    if (msg.role !== "user") return -1
-
-    return result.index
-  })
-
-  const message = createMemo(() => {
-    const index = messageIndex()
-    if (index < 0) return undefined
-
-    const msg = allMessages()[index]
-    if (!msg || msg.role !== "user") return undefined
+    if (msg.role !== "user") return undefined
 
     return msg
   })
@@ -151,6 +141,13 @@ export function SessionTurn(
     return data.store.part[msg.id] ?? []
   })
 
+  const messageIndex = createMemo(() => {
+    const messages = allMessages()
+    const result = Binary.search(messages, props.messageID, (m) => m.id)
+    if (!result.found) return -1
+    return result.index
+  })
+
   const assistantMessages = createMemo(() => {
     const msg = message()
     if (!msg) return [] as AssistantMessage[]