diff --git a/internal/llm/provider/openai.go b/internal/llm/provider/openai.go
index 1a780a74f79d0fe3c41db06145b8a9b79c72802c..bfdeda2bc1cd0738b3370a2132d4945ad64d9fb5 100644
--- a/internal/llm/provider/openai.go
+++ b/internal/llm/provider/openai.go
@@ -374,8 +374,9 @@ func (o *openaiClient) stream(ctx context.Context, messages []message.Message, t
 								newID := uuid.NewString()
 								toolCallIDMap[toolCall.ID] = newID
 								toolCall.ID = newID
+							} else {
+								toolCall.ID = exID
 							}
-							toolCall.ID = exID
 						}
 						newToolCall := false
 						if existingToolCall, ok := msgToolCalls[toolCall.Index]; ok { // tool call exists