diff --git a/projects/stream-chat-angular/src/lib/message-input/autocomplete-textarea/autocomplete-textarea.component.ts b/projects/stream-chat-angular/src/lib/message-input/autocomplete-textarea/autocomplete-textarea.component.ts
index 6363885f..3bc6dd30 100644
--- a/projects/stream-chat-angular/src/lib/message-input/autocomplete-textarea/autocomplete-textarea.component.ts
+++ b/projects/stream-chat-angular/src/lib/message-input/autocomplete-textarea/autocomplete-textarea.component.ts
@@ -275,7 +275,7 @@ export class AutocompleteTextareaComponent
   }
 
   enterHit(event: Event) {
-    if (this.inputMode === 'desktop') {
+    if (this.inputMode === 'desktop' && !(event as KeyboardEvent).isComposing) {
       event.preventDefault();
       this.updateMentionedUsersFromText();
       this.send.next();
diff --git a/projects/stream-chat-angular/src/lib/message-input/textarea/textarea.component.ts b/projects/stream-chat-angular/src/lib/message-input/textarea/textarea.component.ts
index 41bd5be1..84f3babc 100644
--- a/projects/stream-chat-angular/src/lib/message-input/textarea/textarea.component.ts
+++ b/projects/stream-chat-angular/src/lib/message-input/textarea/textarea.component.ts
@@ -109,7 +109,7 @@ export class TextareaComponent
   }
 
   enterHit(event: Event) {
-    if (this.inputMode === 'desktop') {
+    if (this.inputMode === 'desktop' && !(event as KeyboardEvent).isComposing) {
       event.preventDefault();
       this.send.next();
     }