diff --git a/client/src/components/Card/NameEdit.jsx b/client/src/components/Card/NameEdit.jsx
index 82446174..f94b04da 100644
--- a/client/src/components/Card/NameEdit.jsx
+++ b/client/src/components/Card/NameEdit.jsx
@@ -53,6 +53,9 @@ const NameEdit = React.forwardRef(({ children, defaultValue, onUpdate }, ref) =>
     (event) => {
       switch (event.key) {
         case 'Enter':
+          if (event.nativeEvent.isComposing) {
+            break;
+          }
           event.preventDefault();
 
           submit();
diff --git a/client/src/components/CardModal/NameField.jsx b/client/src/components/CardModal/NameField.jsx
index 61dc9121..1dadb9d8 100755
--- a/client/src/components/CardModal/NameField.jsx
+++ b/client/src/components/CardModal/NameField.jsx
@@ -19,7 +19,7 @@ const NameField = React.memo(({ defaultValue, onUpdate }) => {
   }, []);
 
   const handleKeyDown = useCallback((event) => {
-    if (event.key === 'Enter') {
+    if (!event.nativeEvent.isComposing && event.key === 'Enter') {
       event.preventDefault();
 
       event.target.blur();
diff --git a/client/src/components/CardModal/Tasks/Add.jsx b/client/src/components/CardModal/Tasks/Add.jsx
index b606d058..6cf61371 100755
--- a/client/src/components/CardModal/Tasks/Add.jsx
+++ b/client/src/components/CardModal/Tasks/Add.jsx
@@ -61,7 +61,7 @@ const Add = React.forwardRef(({ children, onCreate }, ref) => {
 
   const handleFieldKeyDown = useCallback(
     (event) => {
-      if (event.key === 'Enter') {
+      if (!event.nativeEvent.isComposing && event.key === 'Enter') {
         event.preventDefault();
 
         submit();
diff --git a/client/src/components/CardModal/Tasks/NameEdit.jsx b/client/src/components/CardModal/Tasks/NameEdit.jsx
index d4f4bc51..569ee1c0 100755
--- a/client/src/components/CardModal/Tasks/NameEdit.jsx
+++ b/client/src/components/CardModal/Tasks/NameEdit.jsx
@@ -51,7 +51,7 @@ const NameEdit = React.forwardRef(({ children, defaultValue, onUpdate }, ref) =>
 
   const handleFieldKeyDown = useCallback(
     (event) => {
-      if (event.key === 'Enter') {
+      if (!event.nativeEvent.isComposing && event.key === 'Enter') {
         event.preventDefault();
 
         submit();
diff --git a/client/src/components/List/CardAdd.jsx b/client/src/components/List/CardAdd.jsx
index bdfc3536..3e41af9d 100755
--- a/client/src/components/List/CardAdd.jsx
+++ b/client/src/components/List/CardAdd.jsx
@@ -49,6 +49,10 @@ const CardAdd = React.memo(({ isOpened, onCreate, onClose }) => {
     (event) => {
       switch (event.key) {
         case 'Enter': {
+          if (event.nativeEvent.isComposing) {
+            break;
+          }
+
           event.preventDefault();
 
           const autoOpen = event.ctrlKey;
diff --git a/client/src/components/List/NameEdit.jsx b/client/src/components/List/NameEdit.jsx
index c916726a..b1f64eaf 100755
--- a/client/src/components/List/NameEdit.jsx
+++ b/client/src/components/List/NameEdit.jsx
@@ -50,6 +50,7 @@ const NameEdit = React.forwardRef(({ children, defaultValue, onUpdate }, ref) =>
     (event) => {
       switch (event.key) {
         case 'Enter':
+          if (event.nativeEvent.isComposing) break;
           event.preventDefault();
 
           submit();
diff --git a/client/src/locales/_/index.js b/client/src/locales/_/index.js
index 58bff0d6..efe8103a 100644
--- a/client/src/locales/_/index.js
+++ b/client/src/locales/_/index.js
@@ -1,15 +1,5 @@
 import fromPairs from 'lodash/fromPairs';
 
-import cs from './cs/embed';
-import da from './da/embed';
-import de from './de/embed';
-import en from './en/embed';
-import es from './es/embed';
-import fr from './fr/embed';
-import ja from './ja/embed';
-import pl from './pl/embed';
-import ru from './ru/embed';
-import uz from './uz/embed';
 import zh from './zh/embed';
 
 const localePairs = [