diff --git a/apps/web/client/src/app/project/[id]/_hooks/use-chat/index.tsx b/apps/web/client/src/app/project/[id]/_hooks/use-chat/index.tsx
index fd2d431dc1..12b449b0de 100644
--- a/apps/web/client/src/app/project/[id]/_hooks/use-chat/index.tsx
+++ b/apps/web/client/src/app/project/[id]/_hooks/use-chat/index.tsx
@@ -56,7 +56,7 @@ export function useChat({ conversationId, projectId, initialMessages }: UseChatP
             }),
             onToolCall: async (toolCall) => {
                 setIsExecutingToolCall(true);
-                void handleToolCall(toolCall.toolCall, editorEngine, addToolResult).then(() => {
+                await handleToolCall(toolCall.toolCall, editorEngine, addToolResult).then(() => {
                     setIsExecutingToolCall(false);
                 });
             },
diff --git a/packages/ai/src/agents/root.ts b/packages/ai/src/agents/root.ts
index 134b05e52a..73a1674daa 100644
--- a/packages/ai/src/agents/root.ts
+++ b/packages/ai/src/agents/root.ts
@@ -22,6 +22,7 @@ export const createRootAgentStream = ({
     const systemPrompt = getSystemPromptFromType(chatType);
     const toolSet = getToolSetFromType(chatType);
     return streamText({
+        maxOutputTokens: modelConfig.maxOutputTokens,
         providerOptions: modelConfig.providerOptions,
         messages: convertToStreamMessages(messages),
         model: modelConfig.model,