diff --git a/.vscode/buster.code-workspace b/.vscode/buster.code-workspace
index 162400a94..689cebe60 100644
--- a/.vscode/buster.code-workspace
+++ b/.vscode/buster.code-workspace
@@ -1,23 +1,23 @@
 {
   "folders": [
-    { "path": "./apps/api" },
-    { "path": "./apps/electric-server" },
-    { "path": "./apps/server" },
-    { "path": "./apps/trigger" },
-    { "path": "./apps/web" },
-    { "path": "./packages/access-controls" },
-    { "path": "./packages/ai" },
-    { "path": "./packages/data-source" },
-    { "path": "./packages/database" },
-    { "path": "./packages/rerank" },
-    { "path": "./packages/server-shared" },
-    { "path": "./packages/slack" },
-    { "path": "./packages/stored-values" },
-    { "path": "./packages/supabase" },
-    { "path": "./packages/test-utils" },
-    { "path": "./packages/typescript-config" },
-    { "path": "./packages/vitest-config" },
-    { "path": "./packages/web-tools" }
+    { "path": "../apps/api" },
+    { "path": "../apps/electric-server" },
+    { "path": "../apps/server" },
+    { "path": "../apps/trigger" },
+    { "path": "../apps/web" },
+    { "path": "../packages/access-controls" },
+    { "path": "../packages/ai" },
+    { "path": "../packages/data-source" },
+    { "path": "../packages/database" },
+    { "path": "../packages/rerank" },
+    { "path": "../packages/server-shared" },
+    { "path": "../packages/slack" },
+    { "path": "../packages/stored-values" },
+    { "path": "../packages/supabase" },
+    { "path": "../packages/test-utils" },
+    { "path": "../packages/typescript-config" },
+    { "path": "../packages/vitest-config" },
+    { "path": "../packages/web-tools" }
   ],
   "settings": {
     "editor.defaultFormatter": "biomejs.biome",
diff --git a/apps/web/src/api/buster_rest/chats/requestsV2.ts b/apps/web/src/api/buster_rest/chats/requestsV2.ts
index 33546f28d..acb8811ae 100644
--- a/apps/web/src/api/buster_rest/chats/requestsV2.ts
+++ b/apps/web/src/api/buster_rest/chats/requestsV2.ts
@@ -6,5 +6,5 @@ export const createNewChat = async (props: ChatCreateRequest) => {
 };
 
 export const stopChat = async ({ chatId }: { chatId: string }) => {
-  return mainApiV2.patch<unknown>(`/chats/${chatId}`, { stop: true }).then((res) => res.data);
+  return mainApiV2.delete<unknown>(`/chats/${chatId}/cancel`).then((res) => res.data);
 };
diff --git a/apps/web/src/components/ui/inputs/InputTextAreaButton.tsx b/apps/web/src/components/ui/inputs/InputTextAreaButton.tsx
index b293f417d..8fe8cb60c 100644
--- a/apps/web/src/components/ui/inputs/InputTextAreaButton.tsx
+++ b/apps/web/src/components/ui/inputs/InputTextAreaButton.tsx
@@ -108,29 +108,25 @@ const SubmitButton: React.FC<{
   onSubmitPreflight: () => void;
   onStop?: () => void;
 }> = React.memo(({ disabled, sendIcon, loading, loadingIcon, onSubmitPreflight, onStop }) => {
-  const memoizedPrefix = useMemo(() => {
-    return (
+  const prefix = (
+    <div
+      className={cn('relative h-4 w-4 transition-all duration-300 ease-out will-change-transform')}>
       <div
-        className={cn(
-          'relative h-4 w-4 transition-all duration-300 ease-out will-change-transform'
-        )}>
-        <div
-          className={`absolute inset-0 transition-all duration-300 ease-out ${loading ? 'scale-80 opacity-0' : 'scale-100 opacity-100'}`}>
-          {sendIcon}
-        </div>
-        <div
-          className={`absolute inset-0 flex items-center justify-center text-sm transition-all duration-300 ease-out ${loading ? 'scale-100 opacity-100' : 'scale-85 opacity-0'}`}>
-          {loadingIcon}
-        </div>
+        className={`absolute inset-0 transition-all duration-300 ease-out ${loading ? 'scale-80 opacity-0' : 'scale-100 opacity-100'}`}>
+        {sendIcon}
       </div>
-    );
-  }, [loading, sendIcon, loadingIcon]);
+      <div
+        className={`absolute inset-0 flex items-center justify-center text-sm transition-all duration-300 ease-out ${loading ? 'scale-100 opacity-100' : 'scale-85 opacity-0'}`}>
+        {loadingIcon}
+      </div>
+    </div>
+  );
 
   return (
     <Button
       rounding={'large'}
       variant="black"
-      prefix={memoizedPrefix}
+      prefix={prefix}
       onClick={loading && onStop ? onStop : onSubmitPreflight}
       disabled={disabled}
       className={cn(
diff --git a/apps/web/src/layouts/ChatLayout/ChatContainer/ChatContent/ChatInput/ChatInput.tsx b/apps/web/src/layouts/ChatLayout/ChatContainer/ChatContent/ChatInput/ChatInput.tsx
index ec212b441..55bcdaf7b 100644
--- a/apps/web/src/layouts/ChatLayout/ChatContainer/ChatContent/ChatInput/ChatInput.tsx
+++ b/apps/web/src/layouts/ChatLayout/ChatContainer/ChatContent/ChatInput/ChatInput.tsx
@@ -17,8 +17,8 @@ export const ChatInput: React.FC = React.memo(() => {
   const [inputValue, setInputValue] = useState('');
 
   const disableSubmit = useMemo(() => {
-    return !inputHasText(inputValue);
-  }, [inputValue]);
+    return !inputHasText(inputValue) && !isStreamingMessage;
+  }, [inputValue, isStreamingMessage]);
 
   const { onSubmitPreflight, onStopChat } = useChatInputFlow({
     disableSubmit,
diff --git a/apps/web/src/layouts/ChatLayout/ChatContainer/ChatContent/ChatInput/useChatInputFlow.ts b/apps/web/src/layouts/ChatLayout/ChatContainer/ChatContent/ChatInput/useChatInputFlow.ts
index 3b702bf48..864855182 100644
--- a/apps/web/src/layouts/ChatLayout/ChatContainer/ChatContent/ChatInput/useChatInputFlow.ts
+++ b/apps/web/src/layouts/ChatLayout/ChatContainer/ChatContent/ChatInput/useChatInputFlow.ts
@@ -135,8 +135,10 @@ export const useChatInputFlow = ({
   const onStopChat = useMemoizedFn(() => {
     if (!chatId) return;
     onStopChatContext({ chatId, messageId: currentMessageId });
-    textAreaRef.current?.focus();
-    textAreaRef.current?.select();
+    setTimeout(() => {
+      textAreaRef.current?.focus();
+      textAreaRef.current?.select();
+    }, 100);
   });
 
   return useMemo(