diff --git a/index.html b/index.html
index 9b5f2b73..3198a3fb 100644
--- a/index.html
+++ b/index.html
@@ -30,10 +30,11 @@
 <script type="module" src="./src/index.tsx"></script>
 <script>
     const backgroundColor = (() => {
+        const storageValue = window.localStorage.getItem("theme_background")
         try {
-            return JSON.parse(window.localStorage.getItem("theme_background"))
+            return JSON.parse(storageValue)
         } catch (e) {
-            return null
+            return storageValue
         }
     })();
 
diff --git a/src/lib/storage/AppStorage.ts b/src/lib/storage/AppStorage.ts
index f40746a4..a559b2b4 100644
--- a/src/lib/storage/AppStorage.ts
+++ b/src/lib/storage/AppStorage.ts
@@ -26,7 +26,7 @@ export class Storage {
         return this.parseValue(this.getItem(key), defaultValue);
     }
 
-    setItem(key: string, value: unknown, emitEvent: boolean = true, stringify: boolean = true): void {
+    setItem(key: string, value: unknown, emitEvent: boolean = true): void {
         const currentValue = this.getItem(key);
 
         const fireEvent = (valueToStore: string | undefined) => {
@@ -49,9 +49,10 @@ export class Storage {
             return;
         }
 
+        const stringify = typeof value !== 'string';
         const valueToStore = stringify ? JSON.stringify(value) : value;
 
-        this.storage.setItem(key, valueToStore as string);
+        this.storage.setItem(key, valueToStore);
         fireEvent(valueToStore as string);
     }
 }
diff --git a/src/modules/core/hooks/useStorage.tsx b/src/modules/core/hooks/useStorage.tsx
index 5e3b29c2..27790bf7 100644
--- a/src/modules/core/hooks/useStorage.tsx
+++ b/src/modules/core/hooks/useStorage.tsx
@@ -8,6 +8,7 @@
 
 import { Dispatch, Reducer, SetStateAction, useCallback, useMemo, useReducer, useSyncExternalStore } from 'react';
 import { AppStorage, Storage } from '@/lib/storage/AppStorage.ts';
+import { jsonSaveParse } from '@/lib/HelperFunctions.ts';
 
 const subscribeToStorageUpdates = (callback: () => void) => {
     window.addEventListener('storage', callback);
@@ -31,16 +32,29 @@ function useStorage<T>(
     const setValue = useCallback<React.Dispatch<React.SetStateAction<T | undefined>>>(
         (value) => {
             // Allow value to be a function so we have same API as useState
-            const valueToStore = value instanceof Function ? value(storage.getItemParsed(key, initialState)) : value;
+            const valueToStore = (() => {
+                if (value instanceof Function) {
+                    const previousValue =
+                        jsonSaveParse(storage.getItem(key) ?? '') ?? storage.getItemParsed(key, initialState);
+
+                    return value(previousValue);
+                }
+
+                return value;
+            })();
+
             storage.setItem(key, valueToStore);
         },
         [key],
     );
 
-    const storedValue = useMemo(
-        () => (storedValueRaw !== null ? JSON.parse(storedValueRaw) : initialState),
-        [storedValueRaw, key],
-    );
+    const storedValue = useMemo(() => {
+        if (storedValueRaw === null) {
+            return initialState;
+        }
+
+        return jsonSaveParse(storedValueRaw) ?? storedValueRaw;
+    }, [storedValueRaw, key]);
 
     return [storedValue, setValue];
 }
diff --git a/src/modules/settings/screens/Appearance.tsx b/src/modules/settings/screens/Appearance.tsx
index 800d81bf..b0b58427 100644
--- a/src/modules/settings/screens/Appearance.tsx
+++ b/src/modules/settings/screens/Appearance.tsx
@@ -86,7 +86,7 @@ export const Appearance = () => {
                         setThemeMode(newMode as ThemeMode);
                         setMode(newMode);
                         // in case a non "colorSchemes" mui theme is active, "setMode" does not update the mode ("mui-mode") value
-                        AppStorage.local.setItem('mui-mode', newMode, true, false);
+                        AppStorage.local.setItem('mui-mode', newMode, true);
                     }}
                 >
                     <MenuItem key={ThemeMode.SYSTEM} value={ThemeMode.SYSTEM}>