diff --git a/libs/chat/package.json b/libs/chat/package.json
index edae9af47..ff0d83d69 100644
--- a/libs/chat/package.json
+++ b/libs/chat/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ngaf/chat",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "exports": {
     ".": {
       "types": "./index.d.ts",
diff --git a/libs/chat/src/lib/primitives/chat-message-list/chat-message-list.component.ts b/libs/chat/src/lib/primitives/chat-message-list/chat-message-list.component.ts
index 6de3bf5f2..1b26cbfba 100644
--- a/libs/chat/src/lib/primitives/chat-message-list/chat-message-list.component.ts
+++ b/libs/chat/src/lib/primitives/chat-message-list/chat-message-list.component.ts
@@ -39,7 +39,7 @@ export function getMessageType(message: Message): MessageTemplateType {
   changeDetection: ChangeDetectionStrategy.OnPush,
   styles: [CHAT_HOST_TOKENS, CHAT_MESSAGE_LIST_STYLES],
   template: `
-    @for (message of messages(); track $index) {
+    @for (message of messages(); track message.id) {
       @let template = findTemplate(getMessageType(message));
       @if (template) {
         <ng-container
diff --git a/libs/langgraph/package.json b/libs/langgraph/package.json
index da0594333..651db86c4 100644
--- a/libs/langgraph/package.json
+++ b/libs/langgraph/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ngaf/langgraph",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "peerDependencies": {
     "@ngaf/chat": "*",
     "@ngaf/licensing": "*",
diff --git a/libs/langgraph/src/lib/internals/stream-manager.bridge.ts b/libs/langgraph/src/lib/internals/stream-manager.bridge.ts
index 360457050..f4032f959 100644
--- a/libs/langgraph/src/lib/internals/stream-manager.bridge.ts
+++ b/libs/langgraph/src/lib/internals/stream-manager.bridge.ts
@@ -322,6 +322,10 @@ export function createStreamManagerBridge<T, ResolvedBag extends BagTemplate = B
       // so optimistic human messages and earlier tool messages are preserved.
       if (event.type === 'messages/partial' || event.messageMetadata) {
         subjects.messages$.next(mergeMessages(subjects.messages$.value, normalized));
+      } else if (normalized.length === 0) {
+        // Defensive: skip empty replacements during streaming. An empty
+        // batch shouldn't tear down the entire UI (causes message DOM
+        // teardown + streaming renderer reset = visible jank).
       } else {
         subjects.messages$.next(normalized);
       }
@@ -346,7 +350,9 @@ export function createStreamManagerBridge<T, ResolvedBag extends BagTemplate = B
           // Also sync messages$ from the values state so the full message
           // history (including human messages) is available to consumers.
           const stateMessages = (vals as Record<string, unknown>)['messages'];
-          if (Array.isArray(stateMessages)) {
+          if (Array.isArray(stateMessages) && stateMessages.length > 0) {
+            // Defensive: only sync when state carries messages. An empty
+            // values payload shouldn't wipe the UI mid-stream.
             if (options.toMessage) {
               subjects.messages$.next(stateMessages.map(options.toMessage));
             } else {