diff --git a/src/agents/result.py b/src/agents/result.py
index a2a6cc4a..2dae6332 100644
--- a/src/agents/result.py
+++ b/src/agents/result.py
@@ -186,7 +186,12 @@ async def stream_events(self) -> AsyncIterator[StreamEvent]:
             self._event_queue.task_done()
 
         if self._trace:
-            self._trace.finish(reset_current=True)
+            try:
+                self._trace.finish(reset_current=True)
+            except ValueError:
+                logger.warning("ContextVar reset failed — switching to reset_current=False")
+                self._trace.finish(reset_current=False)
+
 
         self._cleanup_tasks()