diff --git a/app/components/chat/BaseChat.tsx b/app/components/chat/BaseChat.tsx
index a77932c7..3b5c9ad5 100644
--- a/app/components/chat/BaseChat.tsx
+++ b/app/components/chat/BaseChat.tsx
@@ -431,7 +431,9 @@ export const BaseChat = React.forwardRef<HTMLDivElement, BaseChatProps>(
                           return;
                         }
 
-                        handleSendMessage?.(event);
+                        if (!event.nativeEvent.isComposing) {
+                          handleSendMessage?.(event);
+                        }
                       }
                     }}
                     value={input}