diff --git a/src/lib/appearance.ts b/src/lib/appearance.ts
index 774b48127..f5dccadf0 100644
--- a/src/lib/appearance.ts
+++ b/src/lib/appearance.ts
@@ -7,7 +7,7 @@ type Theme = z.infer<typeof themeSchema>;
 export const followSystemTheme = storedWritable<boolean | undefined>(
   "followSystemTheme",
   boolean(),
-  !localStorage.getItem("theme"),
+  !localStorage?.getItem("theme"),
   !window.localStorage,
 );
 export const theme = storedWritable<Theme>(
diff --git a/src/lib/localStore.ts b/src/lib/localStore.ts
index 3bd7f51b3..fe6189235 100644
--- a/src/lib/localStore.ts
+++ b/src/lib/localStore.ts
@@ -92,7 +92,7 @@ export default function storedWritable<
    */
   function clear() {
     w.set(initialValue);
-    localStorage.removeItem(key);
+    if (!disableLocalStorage) localStorage.removeItem(key);
   }
 
   return {