diff --git a/frontend/src/components/settings/Languages.vue b/frontend/src/components/settings/Languages.vue
index c343e114..5fd61be2 100644
--- a/frontend/src/components/settings/Languages.vue
+++ b/frontend/src/components/settings/Languages.vue
@@ -7,39 +7,44 @@
 </template>
 
 <script>
+import { markRaw } from "vue";
+
 export default {
   name: "languages",
   props: ["locale"],
   data() {
-    let dataObj = {
-      locales: {
-        he: "he",
-        hu: "hu",
-        ar: "ar",
-        de: "de",
-        en: "en",
-        es: "es",
-        fr: "fr",
-        is: "is",
-        it: "it",
-        ja: "ja",
-        ko: "ko",
-        "nl-be": "nlBE",
-        pl: "pl",
-        "pt-br": "ptBR",
-        pt: "pt",
-        ro: "ro",
-        ru: "ru",
-        sk: "sk",
-        "sv-se": "svSE",
-        tr: "tr",
-        ua: "ua",
-        "zh-cn": "zhCN",
-        "zh-tw": "zhTW",
-      },
+    let dataObj = {};
+    const locales = {
+      he: "he",
+      hu: "hu",
+      ar: "ar",
+      de: "de",
+      en: "en",
+      es: "es",
+      fr: "fr",
+      is: "is",
+      it: "it",
+      ja: "ja",
+      ko: "ko",
+      "nl-be": "nlBE",
+      pl: "pl",
+      "pt-br": "ptBR",
+      pt: "pt",
+      ro: "ro",
+      ru: "ru",
+      sk: "sk",
+      "sv-se": "svSE",
+      tr: "tr",
+      uk: "uk",
+      "zh-cn": "zhCN",
+      "zh-tw": "zhTW",
     };
 
+    // Vue3 reactivity breaks with this configuration
+    // so we need to use markRaw as a workaround
+    // https://github.com/vuejs/core/issues/3024
     Object.defineProperty(dataObj, "locales", {
+      value: markRaw(locales),
       configurable: false,
       writable: false,
     });
diff --git a/frontend/src/i18n/ar.json b/frontend/src/i18n/ar.json
index 1e1b33e7..1f434028 100644
--- a/frontend/src/i18n/ar.json
+++ b/frontend/src/i18n/ar.json
@@ -97,7 +97,7 @@
     "sk": "Slovenčina",
     "svSE": "",
     "tr": "Türkçe",
-    "ua": "Українська",
+    "uk": "Українська",
     "zhCN": "中文 (简体)",
     "zhTW": "中文 (繁體)"
   },
diff --git a/frontend/src/i18n/de.json b/frontend/src/i18n/de.json
index ad8aadc4..26a6c12c 100644
--- a/frontend/src/i18n/de.json
+++ b/frontend/src/i18n/de.json
@@ -103,7 +103,7 @@
     "sk": "Slovenčina",
     "svSE": "Swedish (Sweden)",
     "tr": "Türkçe",
-    "ua": "Українська",
+    "uk": "Українська",
     "zhCN": "中文 (简体)",
     "zhTW": "中文 (繁體)"
   },
diff --git a/frontend/src/i18n/en.json b/frontend/src/i18n/en.json
index a348b488..6be4460b 100644
--- a/frontend/src/i18n/en.json
+++ b/frontend/src/i18n/en.json
@@ -105,7 +105,7 @@
     "sk": "Slovenčina",
     "svSE": "Swedish (Sweden)",
     "tr": "Türkçe",
-    "ua": "Українська",
+    "uk": "Українська",
     "zhCN": "中文 (简体)",
     "zhTW": "中文 (繁體)"
   },
diff --git a/frontend/src/i18n/es.json b/frontend/src/i18n/es.json
index 28f63283..76af4ba2 100644
--- a/frontend/src/i18n/es.json
+++ b/frontend/src/i18n/es.json
@@ -103,7 +103,7 @@
     "sk": "Slovenčina",
     "svSE": "Swedish (Sweden)",
     "tr": "Türkçe",
-    "ua": "Українська",
+    "uk": "Українська",
     "zhCN": "中文 (简体)",
     "zhTW": "中文 (繁體)"
   },
diff --git a/frontend/src/i18n/fr.json b/frontend/src/i18n/fr.json
index 6ff5e813..d1ebbdca 100644
--- a/frontend/src/i18n/fr.json
+++ b/frontend/src/i18n/fr.json
@@ -103,7 +103,7 @@
     "sk": "Slovenčina",
     "svSE": "",
     "tr": "Türkçe",
-    "ua": "Українська",
+    "uk": "Українська",
     "zhCN": "中文 (简体)",
     "zhTW": "中文 (繁體)"
   },
diff --git a/frontend/src/i18n/he.json b/frontend/src/i18n/he.json
index 630f4f73..b6c8da9a 100644
--- a/frontend/src/i18n/he.json
+++ b/frontend/src/i18n/he.json
@@ -103,7 +103,7 @@
     "sk": "Slovenčina",
     "svSE": "Swedish (Sweden)",
     "tr": "Türkçe",
-    "ua": "Українська",
+    "uk": "Українська",
     "zhCN": "中文 (简体)",
     "zhTW": "中文 (繁體)"
   },
diff --git a/frontend/src/i18n/hu.json b/frontend/src/i18n/hu.json
index 7674e337..28996e77 100644
--- a/frontend/src/i18n/hu.json
+++ b/frontend/src/i18n/hu.json
@@ -103,7 +103,7 @@
     "sk": "Slovenčina",
     "svSE": "Swedish (Sweden)",
     "tr": "Türkçe",
-    "ua": "Українська",
+    "uk": "Українська",
     "zhCN": "中文 (简体)",
     "zhTW": "中文 (繁體)"
   },
diff --git a/frontend/src/i18n/is.json b/frontend/src/i18n/is.json
index 1d3140d8..b0bcd1a6 100644
--- a/frontend/src/i18n/is.json
+++ b/frontend/src/i18n/is.json
@@ -97,7 +97,7 @@
     "sk": "Slovenčina",
     "svSE": "",
     "tr": "Türkçe",
-    "ua": "Українська",
+    "uk": "Українська",
     "zhCN": "中文 (简体)",
     "zhTW": "中文 (繁體)"
   },
diff --git a/frontend/src/i18n/it.json b/frontend/src/i18n/it.json
index cd5f88c4..7fafbaaf 100644
--- a/frontend/src/i18n/it.json
+++ b/frontend/src/i18n/it.json
@@ -97,7 +97,7 @@
     "sk": "Slovenčina",
     "svSE": "",
     "tr": "Türkçe",
-    "ua": "Українська",
+    "uk": "Українська",
     "zhCN": "中文 (简体)",
     "zhTW": "中文 (繁體)"
   },
diff --git a/frontend/src/i18n/ja.json b/frontend/src/i18n/ja.json
index 99d44bad..f95e4d8d 100644
--- a/frontend/src/i18n/ja.json
+++ b/frontend/src/i18n/ja.json
@@ -97,7 +97,7 @@
     "sk": "Slovenčina",
     "svSE": "",
     "tr": "Türkçe",
-    "ua": "Українська",
+    "uk": "Українська",
     "zhCN": "中文 (简体)",
     "zhTW": "中文 (繁體)"
   },
diff --git a/frontend/src/i18n/ko.json b/frontend/src/i18n/ko.json
index 0259ce1a..47985e0a 100644
--- a/frontend/src/i18n/ko.json
+++ b/frontend/src/i18n/ko.json
@@ -97,7 +97,7 @@
     "sk": "Slovenčina",
     "svSE": "",
     "tr": "Türkçe",
-    "ua": "Українська",
+    "uk": "Українська",
     "zhCN": "中文 (简体)",
     "zhTW": "中文 (繁體)"
   },
diff --git a/frontend/src/i18n/nl-be.json b/frontend/src/i18n/nl-be.json
index 0ef50425..bc8ac981 100644
--- a/frontend/src/i18n/nl-be.json
+++ b/frontend/src/i18n/nl-be.json
@@ -97,7 +97,7 @@
     "sk": "Slovenčina",
     "svSE": "",
     "tr": "Türkçe",
-    "ua": "Українська",
+    "uk": "Українська",
     "zhCN": "Chinees (vereenvoudigd)",
     "zhTW": "Chinees (traditioneel)"
   },
diff --git a/frontend/src/i18n/pl.json b/frontend/src/i18n/pl.json
index 47910f69..9bb22c99 100644
--- a/frontend/src/i18n/pl.json
+++ b/frontend/src/i18n/pl.json
@@ -97,7 +97,7 @@
     "sk": "Slovenčina",
     "svSE": "Svenska (Sverige)",
     "tr": "Türkçe",
-    "ua": "Українська",
+    "uk": "Українська",
     "zhCN": "中文 (简体)",
     "zhTW": "中文 (繁體)"
   },
diff --git a/frontend/src/i18n/pt-br.json b/frontend/src/i18n/pt-br.json
index 1c6fbfe9..d399d8f8 100644
--- a/frontend/src/i18n/pt-br.json
+++ b/frontend/src/i18n/pt-br.json
@@ -103,7 +103,7 @@
     "sk": "Slovenčina",
     "svSE": "",
     "tr": "Türkçe",
-    "ua": "Українська",
+    "uk": "Українська",
     "zhCN": "中文 (简体)",
     "zhTW": "中文 (繁體)"
   },
diff --git a/frontend/src/i18n/pt.json b/frontend/src/i18n/pt.json
index 7a56444d..ff258b91 100644
--- a/frontend/src/i18n/pt.json
+++ b/frontend/src/i18n/pt.json
@@ -97,7 +97,7 @@
     "sk": "Slovenčina",
     "svSE": "",
     "tr": "Türkçe",
-    "ua": "Українська",
+    "uk": "Українська",
     "zhCN": "Chinês simplificado",
     "zhTW": "Chinês tradicional"
   },
diff --git a/frontend/src/i18n/ro.json b/frontend/src/i18n/ro.json
index d4eaffa0..fad1b735 100644
--- a/frontend/src/i18n/ro.json
+++ b/frontend/src/i18n/ro.json
@@ -97,7 +97,7 @@
     "sk": "Slovenčina",
     "svSE": "",
     "tr": "Türkçe",
-    "ua": "Українська",
+    "uk": "Українська",
     "zhCN": "中文 (简体)",
     "zhTW": "中文 (繁體)"
   },
diff --git a/frontend/src/i18n/ru.json b/frontend/src/i18n/ru.json
index 8e96332c..9e7d96bd 100644
--- a/frontend/src/i18n/ru.json
+++ b/frontend/src/i18n/ru.json
@@ -103,7 +103,7 @@
     "sk": "Slovenčina",
     "svSE": "Swedish (Sweden)",
     "tr": "Türkçe",
-    "ua": "Українська",
+    "uk": "Українська",
     "zhCN": "中文 (简体)",
     "zhTW": "中文 (繁體)"
   },
diff --git a/frontend/src/i18n/sk.json b/frontend/src/i18n/sk.json
index 99685648..0349d78f 100644
--- a/frontend/src/i18n/sk.json
+++ b/frontend/src/i18n/sk.json
@@ -103,7 +103,7 @@
     "sk": "Slovenčina",
     "svSE": "Swedish (Sweden)",
     "tr": "Türkçe",
-    "ua": "Українська",
+    "uk": "Українська",
     "zhCN": "中文 (简体)",
     "zhTW": "中文 (繁體)"
   },
diff --git a/frontend/src/i18n/sv-se.json b/frontend/src/i18n/sv-se.json
index 6fbc790d..cea765f4 100644
--- a/frontend/src/i18n/sv-se.json
+++ b/frontend/src/i18n/sv-se.json
@@ -97,7 +97,7 @@
     "sk": "Slovenčina",
     "svSE": "",
     "tr": "Türkçe",
-    "ua": "Українська",
+    "uk": "Українська",
     "zhCN": "中文 (简体)",
     "zhTW": "中文 (繁體)"
   },
diff --git a/frontend/src/i18n/tr.json b/frontend/src/i18n/tr.json
index ba003478..e24f642f 100644
--- a/frontend/src/i18n/tr.json
+++ b/frontend/src/i18n/tr.json
@@ -101,7 +101,7 @@
     "sk": "Slovenčina",
     "svSE": "Swedish (Sweden)",
     "tr": "Türkçe",
-    "ua": "Українська",
+    "uk": "Українська",
     "zhCN": "中文 (简体)",
     "zhTW": "中文 (繁體)"
   },
diff --git a/frontend/src/i18n/uk.json b/frontend/src/i18n/uk.json
index 4a9f6863..8ee0a570 100644
--- a/frontend/src/i18n/uk.json
+++ b/frontend/src/i18n/uk.json
@@ -103,7 +103,7 @@
     "sk": "Slovenčina",
     "svSE": "Swedish (Sweden)",
     "tr": "Türkçe",
-    "ua": "Українська",
+    "uk": "Українська",
     "zhCN": "中文 (简体)",
     "zhTW": "中文 (繁體)"
   },
diff --git a/frontend/src/i18n/zh-cn.json b/frontend/src/i18n/zh-cn.json
index 110bdcc9..80307412 100644
--- a/frontend/src/i18n/zh-cn.json
+++ b/frontend/src/i18n/zh-cn.json
@@ -103,7 +103,7 @@
     "sk": "Slovenčina",
     "svSE": "Swedish（Sweden）",
     "tr": "Türkçe",
-    "ua": "Українська",
+    "uk": "Українська",
     "zhCN": "中文（简体）",
     "zhTW": "中文（繁體）"
   },
diff --git a/frontend/src/i18n/zh-tw.json b/frontend/src/i18n/zh-tw.json
index d2add918..6f6b991a 100644
--- a/frontend/src/i18n/zh-tw.json
+++ b/frontend/src/i18n/zh-tw.json
@@ -97,7 +97,7 @@
     "sk": "Slovenčina",
     "svSE": "Swedish（Sweden）",
     "tr": "Türkçe",
-    "ua": "Українська",
+    "uk": "Українська",
     "zhCN": "中文 (简体)",
     "zhTW": "中文 (繁體)"
   },