diff --git a/apps/web/core/components/comments/card/edit-form.tsx b/apps/web/core/components/comments/card/edit-form.tsx
index 9be8b135521..26c32374c86 100644
--- a/apps/web/core/components/comments/card/edit-form.tsx
+++ b/apps/web/core/components/comments/card/edit-form.tsx
@@ -77,7 +77,8 @@ export const CommentCardEditForm = observer(function CommentCardEditForm(props:
     <form className="flex flex-col gap-2">
       <div
         onKeyDown={(e) => {
-          if (e.key === "Enter" && !e.shiftKey && !e.ctrlKey && !e.metaKey && !isEmpty) handleSubmit(onEnter)(e);
+          if (e.key === "Enter" && !e.nativeEvent.isComposing && !e.shiftKey && !e.ctrlKey && !e.metaKey && !isEmpty)
+            handleSubmit(onEnter)(e);
         }}
       >
         <LiteTextEditor
@@ -90,7 +91,7 @@ export const CommentCardEditForm = observer(function CommentCardEditForm(props:
           value={null}
           onChange={(_comment_json, comment_html) => setValue("comment_html", comment_html)}
           onEnterKeyPress={(e) => {
-            if (!isEmpty && !isSubmitting) {
+            if (!e.nativeEvent.isComposing && !isEmpty && !isSubmitting) {
               handleSubmit(onEnter)(e);
             }
           }}
diff --git a/apps/web/core/components/comments/comment-create.tsx b/apps/web/core/components/comments/comment-create.tsx
index d230a5be93e..bfa8da9ab90 100644
--- a/apps/web/core/components/comments/comment-create.tsx
+++ b/apps/web/core/components/comments/comment-create.tsx
@@ -96,6 +96,7 @@ export const CommentCreate = observer(function CommentCreate(props: TCommentCrea
       onKeyDown={(e) => {
         if (
           e.key === "Enter" &&
+          !e.nativeEvent.isComposing &&
           !e.shiftKey &&
           !e.ctrlKey &&
           !e.metaKey &&
@@ -122,7 +123,7 @@ export const CommentCreate = observer(function CommentCreate(props: TCommentCrea
                 workspaceSlug={workspaceSlug}
                 projectId={projectId}
                 onEnterKeyPress={(e) => {
-                  if (!isEmpty && !isSubmitting) {
+                  if (!e.nativeEvent.isComposing && !isEmpty && !isSubmitting) {
                     handleSubmit(onSubmit)(e);
                   }
                 }}