diff --git a/src/lib/storage/AppStorage.ts b/src/lib/storage/AppStorage.ts
index b7028034..d9fd085a 100644
--- a/src/lib/storage/AppStorage.ts
+++ b/src/lib/storage/AppStorage.ts
@@ -7,6 +7,8 @@
  */
 
 // eslint-disable-next-line max-classes-per-file
+import { jsonSaveParse } from '@/lib/HelperFunctions.ts';
+
 export class Storage {
     constructor(private readonly storage: typeof window.localStorage) {}
 
@@ -15,11 +17,7 @@ export class Storage {
             return defaultValue;
         }
 
-        if (typeof defaultValue === 'string') {
-            return value as T;
-        }
-
-        return JSON.parse(value);
+        return jsonSaveParse(value) ?? (value as T);
     }
 
     getItem(key: string): string | null {