diff --git a/src/lib/components/chat/Settings/General.svelte b/src/lib/components/chat/Settings/General.svelte
index 0a9c88e3b..eb3b7a9f2 100644
--- a/src/lib/components/chat/Settings/General.svelte
+++ b/src/lib/components/chat/Settings/General.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { toast } from 'svelte-sonner';
 	import { createEventDispatcher, onMount, getContext } from 'svelte';
-	import { languages } from '$lib/i18n';
+	import { getLanguages } from '$lib/i18n';
 	const dispatch = createEventDispatcher();
 
 	import { models, user } from '$lib/stores';
@@ -16,7 +16,7 @@
 	// General
 	let themes = ['dark', 'light', 'rose-pine dark', 'rose-pine-dawn light'];
 	let theme = 'dark';
-	// TODO: Get these dynamically from the i18n module
+	let languages = [];
 	let lang = $i18n.language;
 	let notificationEnabled = false;
 	let system = '';
@@ -69,6 +69,7 @@
 
 	onMount(async () => {
 		let settings = JSON.parse(localStorage.getItem('settings') ?? '{}');
+		languages = await getLanguages();
 
 		theme = localStorage.theme ?? 'dark';
 		notificationEnabled = settings.notificationEnabled ?? false;
diff --git a/src/lib/i18n/index.ts b/src/lib/i18n/index.ts
index a1688367d..6bd89a5ea 100644
--- a/src/lib/i18n/index.ts
+++ b/src/lib/i18n/index.ts
@@ -51,7 +51,7 @@ i18next
 			lookupLocalStorage: 'locale'
 		},
 		fallbackLng: {
-			default: ['en-US']
+			default: ['en']
 		},
 		ns: 'translation',
 		interpolation: {
@@ -62,6 +62,9 @@ i18next
 const i18n = createI18nStore(i18next);
 const isLoadingStore = createIsLoadingStore(i18next);
 
-export const languages = (await import(`./locales/languages.json`)).default;
+export const getLanguages = async () => {
+	const languages = (await import(`./locales/languages.json`)).default;
+	return languages;
+};
 export default i18n;
 export const isLoading = isLoadingStore;
diff --git a/src/lib/i18n/locales/en-US/translation.json b/src/lib/i18n/locales/en/translation.json
similarity index 100%
rename from src/lib/i18n/locales/en-US/translation.json
rename to src/lib/i18n/locales/en/translation.json
diff --git a/src/lib/i18n/locales/languages.json b/src/lib/i18n/locales/languages.json
index bcfca80e0..7d552bf99 100644
--- a/src/lib/i18n/locales/languages.json
+++ b/src/lib/i18n/locales/languages.json
@@ -1,22 +1,22 @@
 [
 	{
-		"title": "English",
-		"code": "en-US"
+		"code": "en",
+		"title": "English"
 	},
 	{
-		"title": "فارسی",
-		"code": "fa"
+		"code": "fa",
+		"title": "فارسی"
 	},
 	{
-		"title": "Deutsch",
-		"code": "de"
+		"code": "de",
+		"title": "Deutsch"
 	},
 	{
-		"title": "French",
-		"code": "fr"
+		"code": "fr",
+		"title": "French"
 	},
 	{
-		"title": "Ukrainian",
-		"code": "uk"
+		"code": "uk",
+		"title": "Ukrainian"
 	}
 ]