diff --git a/apps/frontend/components/chat/ProjectChat.tsx b/apps/frontend/components/chat/ProjectChat.tsx
index c77a8996..b5209ded 100644
--- a/apps/frontend/components/chat/ProjectChat.tsx
+++ b/apps/frontend/components/chat/ProjectChat.tsx
@@ -37,6 +37,7 @@ import {
     MicOff,
     RotateCcw,
     SendIcon,
+    Square,
     Volume2,
     VolumeX,
     X,
@@ -512,7 +513,7 @@ function ProjectChatSession({
         }
     }, [selectedModelId, selectableModels]);
 
-    const { messages, sendMessage, status, addToolOutput } = useChat<ChatUIMessage>({
+    const { messages, sendMessage, status, addToolOutput, stop } = useChat<ChatUIMessage>({
         chat: entry.chat,
     });
 
@@ -915,21 +916,31 @@ function ProjectChatSession({
                             {isRecording ? <MicOff className="h-4 w-4" /> : <Mic className="h-4 w-4" />}
                         </Button>
                     )}
-                    <Button
-                        size="icon"
-                        onClick={() => void handleSendMessage()}
-                        disabled={
-                            !inputValue.trim() ||
-                            isAssistantTyping ||
-                            isRecording ||
-                            !!pendingClarification ||
-                            noModelsConfigured
-                        }
-                        className={isEmptyChat ? "h-10 w-10 shrink-0" : undefined}
-                    >
-                        <SendIcon className="h-4 w-4" />
-                        <span className="sr-only">{t("send.message")}</span>
-                    </Button>
+                    {isAssistantTyping ? (
+                        <Button
+                            size="icon"
+                            onClick={() => stop()}
+                            className={isEmptyChat ? "h-10 w-10 shrink-0" : undefined}
+                        >
+                            <Square className="h-4 w-4" />
+                            <span className="sr-only">{t("stop.response")}</span>
+                        </Button>
+                    ) : (
+                        <Button
+                            size="icon"
+                            onClick={() => void handleSendMessage()}
+                            disabled={
+                                !inputValue.trim() ||
+                                isRecording ||
+                                !!pendingClarification ||
+                                noModelsConfigured
+                            }
+                            className={isEmptyChat ? "h-10 w-10 shrink-0" : undefined}
+                        >
+                            <SendIcon className="h-4 w-4" />
+                            <span className="sr-only">{t("send.message")}</span>
+                        </Button>
+                    )}
                 </div>
             </div>
         </div>
diff --git a/apps/frontend/messages/de.json b/apps/frontend/messages/de.json
index 8c6c0744..24ea0c60 100644
--- a/apps/frontend/messages/de.json
+++ b/apps/frontend/messages/de.json
@@ -91,6 +91,7 @@
     "copied.code": "Code kopiert",
     "start.recording": "Spracheingabe starten",
     "stop.recording": "Spracheingabe beenden",
+    "stop.response": "Antwort stoppen",
     "play.message": "Abspielen",
     "stop.speaking": "Stopp",
     "deep.mode": "Tiefe Analyse",
diff --git a/apps/frontend/messages/en.json b/apps/frontend/messages/en.json
index 14656ab3..35e2f248 100644
--- a/apps/frontend/messages/en.json
+++ b/apps/frontend/messages/en.json
@@ -91,6 +91,7 @@
     "copied.code": "Code copied",
     "start.recording": "Start voice input",
     "stop.recording": "Stop voice input",
+    "stop.response": "Stop response",
     "play.message": "Play",
     "stop.speaking": "Stop",
     "deep.mode": "Deep Mode",