diff --git a/packages/ui/src/components/chat-input.tsx b/packages/ui/src/components/chat-input.tsx
index 16c25cc9..9c9a2b05 100644
--- a/packages/ui/src/components/chat-input.tsx
+++ b/packages/ui/src/components/chat-input.tsx
@@ -33,7 +33,7 @@ export function ChatInput({ onSubmit, disabled }: ChatInputProps) {
           e.target.style.height = `${Math.min(e.target.scrollHeight, 200)}px`;
         }}
         onKeyDown={(e) => {
-          if (e.key === "Enter" && !e.shiftKey) {
+          if (e.key === "Enter" && !e.shiftKey && !e.nativeEvent.isComposing) {
             e.preventDefault();
             handleSubmit();
           }