diff --git a/src/openai/_streaming.py b/src/openai/_streaming.py
index 45c13cc11d..7896a57456 100644
--- a/src/openai/_streaming.py
+++ b/src/openai/_streaming.py
@@ -67,7 +67,10 @@ def __stream__(self) -> Iterator[_T]:
                 if sse.event and sse.event.startswith("thread."):
                     data = sse.json()
 
-                    if sse.event == "error" and is_mapping(data) and data.get("error"):
+                    yield process_data(data={"data": data, "event": sse.event}, cast_to=cast_to, response=response)
+                elif sse.event == "error":
+                    data = sse.json()
+                    if is_mapping(data) and data.get("error"):
                         message = None
                         error = data.get("error")
                         if is_mapping(error):
@@ -80,8 +83,6 @@ def __stream__(self) -> Iterator[_T]:
                             request=self.response.request,
                             body=data["error"],
                         )
-
-                    yield process_data(data={"data": data, "event": sse.event}, cast_to=cast_to, response=response)
                 else:
                     data = sse.json()
                     if is_mapping(data) and data.get("error"):
@@ -177,7 +178,10 @@ async def __stream__(self) -> AsyncIterator[_T]:
                 if sse.event and sse.event.startswith("thread."):
                     data = sse.json()
 
-                    if sse.event == "error" and is_mapping(data) and data.get("error"):
+                    yield process_data(data={"data": data, "event": sse.event}, cast_to=cast_to, response=response)
+                elif sse.event == "error":
+                    data = sse.json()
+                    if is_mapping(data) and data.get("error"):
                         message = None
                         error = data.get("error")
                         if is_mapping(error):
@@ -190,8 +194,6 @@ async def __stream__(self) -> AsyncIterator[_T]:
                             request=self.response.request,
                             body=data["error"],
                         )
-
-                    yield process_data(data={"data": data, "event": sse.event}, cast_to=cast_to, response=response)
                 else:
                     data = sse.json()
                     if is_mapping(data) and data.get("error"):