diff --git a/src/Response/ResponsesStreamedResponseWrapper.php b/src/Response/ResponsesStreamedResponseWrapper.php
index 3533269..90d0948 100644
--- a/src/Response/ResponsesStreamedResponseWrapper.php
+++ b/src/Response/ResponsesStreamedResponseWrapper.php
@@ -110,7 +110,7 @@ public function getIterator(): Generator
             assert($response instanceof CreateStreamedResponse);
             $this->generated[] = $response;
 
-            if ($response->response instanceof CreateResponse) {
+            if ($response->event === 'response.created' && $response->response instanceof CreateResponse) {
                 $this->agent->orchestrator()->context->withPreviousResponseId($response->response->id);
 
                 continue;
@@ -133,7 +133,7 @@ public function getIterator(): Generator
             }
 
             // and execute them when done collecting
-            if (! empty($capturedToolCalls) && $response->event === 'response.output_item.done') {
+            if (! empty($capturedToolCalls) && $response->event === 'response.completed') {
                 $this->agent->executeTools($capturedToolCalls);
 
                 break;