diff --git a/crates/goose/src/providers/formats/openai.rs b/crates/goose/src/providers/formats/openai.rs
index 937d9658ff..34cf33fc84 100644
--- a/crates/goose/src/providers/formats/openai.rs
+++ b/crates/goose/src/providers/formats/openai.rs
@@ -512,11 +512,8 @@ where
                                                 }
                                             }
                                         }
-                                    } else {
-                                        done = true;
                                     }
-
-                                    if tool_chunk.choices[0].finish_reason == Some("tool_calls".to_string()) {
+                                    if tool_chunk.choices[0].finish_reason.is_some() {
                                         done = true;
                                     }
                                 } else {