diff --git a/src/App.jsx b/src/App.jsx
index 04dfeeb4f..feddfb60f 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -12,17 +12,28 @@ import { logger } from "./Utils/Logger"; // Import the logger
 import { networkService } from "./main";
 import { Routes } from "./Routes";
 import WalletProvider from "./Components/WalletProvider";
+import { useTranslation } from "react-i18next";
+import { setLanguage } from "./Features/UI/uiSlice";
 
 function App() {
 	const mode = useSelector((state) => state.ui.mode);
 	const { authToken } = useSelector((state) => state.auth);
 	const dispatch = useDispatch();
+	const { i18n } = useTranslation();
 
 	useEffect(() => {
 		if (authToken) {
-			dispatch(getAppSettings({ authToken }));
+			dispatch(getAppSettings({ authToken })).then((action) => {
+				if (action.payload && action.payload.success) {
+					const { language } = action.payload.data;
+					if (language) {
+						dispatch(setLanguage(language));
+						i18n.changeLanguage(language);
+					}
+				}
+			});
 		}
-	}, [dispatch, authToken]);
+	}, [dispatch, authToken, i18n]);
 
 	// Cleanup
 	useEffect(() => {
diff --git a/src/Components/LanguageSelector.jsx b/src/Components/LanguageSelector.jsx
index ca8e9207c..70c41e640 100644
--- a/src/Components/LanguageSelector.jsx
+++ b/src/Components/LanguageSelector.jsx
@@ -14,7 +14,6 @@ const LanguageSelector = () => {
 		i18n.changeLanguage(newLang);
 	};
 
-	// i18n instance'ından mevcut dilleri al
 	const languages = Object.keys(i18n.options.resources || {});
 
 	return (
diff --git a/src/Features/Settings/settingsSlice.js b/src/Features/Settings/settingsSlice.js
index 78bd81c08..345a8a264 100644
--- a/src/Features/Settings/settingsSlice.js
+++ b/src/Features/Settings/settingsSlice.js
@@ -5,6 +5,7 @@ const initialState = {
 	isLoading: false,
 	apiBaseUrl: "",
 	logLevel: "debug",
+	language: "",
 };
 
 export const getAppSettings = createAsyncThunk(
@@ -69,6 +70,7 @@ const handleGetSettingsFulfilled = (state, action) => {
 	state.msg = action.payload.msg;
 	state.apiBaseUrl = action.payload.data.apiBaseUrl;
 	state.logLevel = action.payload.data.logLevel;
+	state.language = action.payload.data.language;
 };
 const handleGetSettingsRejected = (state, action) => {
 	state.isLoading = false;