diff --git a/thoughts-frontend/lib/api.ts b/thoughts-frontend/lib/api.ts
index 69b0e61..ef743ce 100644
--- a/thoughts-frontend/lib/api.ts
+++ b/thoughts-frontend/lib/api.ts
@@ -243,8 +243,22 @@ export const deleteThought = (thoughtId: string, token: string) =>
 export const getThoughtById = (thoughtId: string, token: string | null) =>
   apiFetch(`/thoughts/${thoughtId}`, {}, ThoughtSchema, token);
 
-export const getThoughtThread = (thoughtId: string, token: string | null) =>
-  apiFetch(`/thoughts/${thoughtId}/thread`, {}, ThoughtThreadSchema, token);
+export const getThoughtThread = async (thoughtId: string, token: string | null): Promise<ThoughtThread> => {
+  const thoughts = await apiFetch(`/thoughts/${thoughtId}/thread`, {}, z.array(ThoughtSchema), token);
+  type T = z.infer<typeof ThoughtSchema>;
+  const repliesMap: Record<string, T[]> = {};
+  for (const t of thoughts) {
+    if (t.replyToId) {
+      (repliesMap[t.replyToId] ??= []).push(t);
+    }
+  }
+  function build(t: T): ThoughtThread {
+    return { ...t, replies: (repliesMap[t.id] ?? []).map(build) };
+  }
+  const root = thoughts.find((t) => t.id === thoughtId) ?? thoughts[0];
+  if (!root) throw new Error("Thread not found");
+  return build(root);
+};
 
 // ── Tags ──────────────────────────────────────────────────────────────────