diff --git a/src/contexts/AppLayoutContext.tsx b/src/contexts/AppLayoutContext.tsx
index e45cc5f..74401e5 100644
--- a/src/contexts/AppLayoutContext.tsx
+++ b/src/contexts/AppLayoutContext.tsx
@@ -1,3 +1,4 @@
+import useStateWithLocalStorage from "hooks/useStateWithLocalStorage";
 import React, { ReactNode, useContext, useEffect, useState } from "react";
 
 export interface AppLayoutState {
@@ -39,44 +40,32 @@ type Props = {
 };
 
 export const AppContextProvider = (props: Props) => {
-  function useLocalStorage(
-    value: boolean,
-    setter: React.Dispatch<React.SetStateAction<boolean>>,
-    name: string
-  ): void {
-    useEffect(() => {
-      const data = localStorage.getItem(name);
-      if (data) setter(JSON.parse(data));
-    }, [setter, name]);
-
-    useEffect(() => {
-      localStorage.setItem(name, JSON.stringify(value));
-    }, [value, name]);
-  }
-
-  const [subPanelOpen, setSubPanelOpen] = useState<boolean>(
+  const [subPanelOpen, setSubPanelOpen] = useStateWithLocalStorage<boolean>(
+    "subPanelOpen",
     initialState.subPanelOpen
   );
 
-  const [languagePanelOpen, setLanguagePanelOpen] = useState<boolean>(
-    initialState.languagePanelOpen
-  );
+  const [languagePanelOpen, setLanguagePanelOpen] =
+    useStateWithLocalStorage<boolean>(
+      "languagePanelOpen",
+      initialState.languagePanelOpen
+    );
 
-  const [mainPanelReduced, setMainPanelReduced] = useState<boolean>(
-    initialState.mainPanelReduced
-  );
+  const [mainPanelReduced, setMainPanelReduced] =
+    useStateWithLocalStorage<boolean>(
+      "mainPanelReduced",
+      initialState.mainPanelReduced
+    );
 
-  const [mainPanelOpen, setMainPanelOpen] = useState<boolean>(
+  const [mainPanelOpen, setMainPanelOpen] = useStateWithLocalStorage<boolean>(
+    "mainPanelOpen",
     initialState.mainPanelOpen
   );
 
-  const [darkMode, setDarkMode] = useState<boolean>(initialState.darkMode);
-
-  useLocalStorage(subPanelOpen, setSubPanelOpen, "subPanelOpen");
-  useLocalStorage(languagePanelOpen, setLanguagePanelOpen, "languagePanelOpen");
-  useLocalStorage(mainPanelReduced, setMainPanelReduced, "mainPanelReduced");
-  useLocalStorage(mainPanelOpen, setMainPanelOpen, "mainPanelOpen");
-  useLocalStorage(darkMode, setDarkMode, "darkMode");
+  const [darkMode, setDarkMode] = useStateWithLocalStorage<boolean>(
+    "darkMode",
+    initialState.darkMode
+  );
 
   return (
     <AppContext.Provider
diff --git a/src/hooks/useStateWithLocalStorage.ts b/src/hooks/useStateWithLocalStorage.ts
new file mode 100644
index 0000000..5832fce
--- /dev/null
+++ b/src/hooks/useStateWithLocalStorage.ts
@@ -0,0 +1,23 @@
+import { useEffect, useState } from "react";
+
+export default function useStateWithLocalStorage<T>(
+  key: string,
+  initialValue: T
+): [T, React.Dispatch<React.SetStateAction<T>>] {
+  const [value, setValue] = useState<T>(initialValue);
+
+  useEffect(() => {
+    try {
+      const item = localStorage.getItem(key);
+      if (item) setValue(JSON.parse(item) as T);
+    } catch (error) {
+      console.warn(`Error reading localStorage key “${key}”:`, error);
+    }
+  }, [setValue, key]);
+
+  useEffect(() => {
+    localStorage.setItem(key, JSON.stringify(value));
+  }, [value, key]);
+
+  return [value, setValue];
+}