diff --git a/client/src/components/chat.tsx b/client/src/components/chat.tsx
index b54521de539..8173e99da55 100644
--- a/client/src/components/chat.tsx
+++ b/client/src/components/chat.tsx
@@ -61,10 +61,13 @@ export default function Page({ agentId }: { agentId: UUID }) {
 
     const handleKeyDown = (e: React.KeyboardEvent<HTMLTextAreaElement>) => {
         if (e.key === "Enter" && !e.shiftKey) {
+            e.preventDefault();
+            if (e.nativeEvent.isComposing) return;
             handleSendMessage(e as unknown as React.FormEvent<HTMLFormElement>);
         }
     };
 
+
     const handleSendMessage = (e: React.FormEvent<HTMLFormElement>) => {
         e.preventDefault();
         if (!input) return;