diff --git a/web/src/components/chat/ChatMessage.tsx b/web/src/components/chat/ChatMessage.tsx
index f9f441b92f..c5d9a207f8 100644
--- a/web/src/components/chat/ChatMessage.tsx
+++ b/web/src/components/chat/ChatMessage.tsx
@@ -133,7 +133,7 @@ export function MessageBubble({
             variant="select"
             size="icon"
             className="size-9 rounded-full"
-            disabled={!draftContent.trim()}
+            disabled={!draftContent.trim() || onEditSubmit == null}
             onClick={handleEditSubmit}
             aria-label={t("send")}
           >
diff --git a/web/src/pages/Chat.tsx b/web/src/pages/Chat.tsx
index 6242dd88dc..4e96889dfd 100644
--- a/web/src/pages/Chat.tsx
+++ b/web/src/pages/Chat.tsx
@@ -362,7 +362,7 @@ export default function ChatPage() {
             role="user"
             content={msg.content}
             messageIndex={i}
-            onEditSubmit={handleEditSubmit}
+            onEditSubmit={isLoading ? undefined : handleEditSubmit}
             isComplete
             showStats={showStats}
           />