diff --git a/apps/web/src/components/chat/ChatThread.tsx b/apps/web/src/components/chat/ChatThread.tsx
index 50a0209c1..c1b9c537f 100644
--- a/apps/web/src/components/chat/ChatThread.tsx
+++ b/apps/web/src/components/chat/ChatThread.tsx
@@ -18,16 +18,14 @@ export function useStickToBottom(messages: ChatMessage[], resetKey: unknown) {
     if (!box) return;
     // On ne défile que si le contenu a réellement changé.
     const last = messages[messages.length - 1];
-    const sig = [
-      messages.length,
-      last?.content.length ?? 0,
-      last?.toolCalls?.length ?? 0,
-      last?.actions?.length ?? 0,
-      last?.reflections?.length ?? 0,
-      last?.milestones?.length ?? 0,
-      last?.liveLabel ?? '',
-      last?.streaming ? 1 : 0,
-    ].join('|');
+    const sig = messages.length + '|' +
+      (last?.content.length ?? 0) + '|' +
+      (last?.toolCalls?.length ?? 0) + '|' +
+      (last?.actions?.length ?? 0) + '|' +
+      (last?.reflections?.length ?? 0) + '|' +
+      (last?.milestones?.length ?? 0) + '|' +
+      (last?.liveLabel ?? '') + '|' +
+      (last?.streaming ? 1 : 0);
     if (sig === lastSig.current) return;
     const first = lastSig.current === '';
     lastSig.current = sig;
diff --git a/apps/web/src/components/chat/CodeBlock.tsx b/apps/web/src/components/chat/CodeBlock.tsx
index a86bfe958..a333222d9 100644
--- a/apps/web/src/components/chat/CodeBlock.tsx
+++ b/apps/web/src/components/chat/CodeBlock.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useRef, useState } from 'preact/hooks';
+import { useEffect, useMemo, useRef, useState } from 'preact/hooks';
 import { Check, Copy } from 'lucide-preact';
 import { copyText } from '../../lib/clipboard';
 import { highlightCode, normalizeLang, type CodeToken } from '../../lib/highlight';
@@ -26,7 +26,19 @@ export function CodeBlock({ code, lang }: { code: string; lang?: string }) {
       window.clearTimeout(t);
     };
   }, [code, lang]);
-  const shown = tokens && tokens.map((l) => l.map((t) => t.content).join('')).join('\n') === code ? tokens : null;
+
+  const shown = useMemo(() => {
+    if (!tokens) return null;
+    let text = '';
+    for (let i = 0; i < tokens.length; i++) {
+      const line = tokens[i];
+      for (let j = 0; j < line.length; j++) {
+        text += line[j].content;
+      }
+      if (i < tokens.length - 1) text += '\n';
+    }
+    return text === code ? tokens : null;
+  }, [tokens, code]);
 
   async function onCopy() {
     const ok = await copyText(code);