From 741c6f8d50204cdb408f6b4192bfb221bd1af80d Mon Sep 17 00:00:00 2001
From: Christian Bromann <git@bromann.dev>
Date: Wed, 18 Mar 2026 15:46:35 -0700
Subject: [PATCH] cr

---
 libs/langgraph/langgraph/pregel/remote.py | 12 ++++++------
 libs/langgraph/tests/test_stream_v2.py    |  1 +
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/libs/langgraph/langgraph/pregel/remote.py b/libs/langgraph/langgraph/pregel/remote.py
index 9c6a367b4..e6f4eaa2b 100644
--- a/libs/langgraph/langgraph/pregel/remote.py
+++ b/libs/langgraph/langgraph/pregel/remote.py
@@ -119,12 +119,12 @@ def _restore_message_metadata(
     if not isinstance(message, dict):
         return data
     message_id = message.get("id")
-    if not isinstance(message_id, str):
-        return data
-    if isinstance(metadata, dict):
-        metadata_by_message_id[message_id] = metadata
-        return (message, metadata)
-    return (message, metadata_by_message_id.get(message_id))
+    if isinstance(message_id, str):
+        if isinstance(metadata, dict):
+            metadata_by_message_id[message_id] = metadata
+        else:
+            metadata = metadata_by_message_id.get(message_id)
+    return (message, metadata)
 
 
 def _merge_values_patch(
diff --git a/libs/langgraph/tests/test_stream_v2.py b/libs/langgraph/tests/test_stream_v2.py
index 4e692976d..60cbfb9cd 100644
--- a/libs/langgraph/tests/test_stream_v2.py
+++ b/libs/langgraph/tests/test_stream_v2.py
@@ -603,6 +603,7 @@ class TestV2StreamAsync:
             assert isinstance(metadata, dict)
             assert "langgraph_node" in metadata
 
+    @NEEDS_CONTEXTVARS
     @pytest.mark.anyio
     async def test_messages_streaming_compact_dedupes_metadata(self) -> None:
         graph = _make_streaming_messages_graph().compile()