diff --git a/web/src/AppBar.jsx b/web/src/AppBar.jsx
index e99f8be71..f71f4124f 100644
--- a/web/src/AppBar.jsx
+++ b/web/src/AppBar.jsx
@@ -17,7 +17,7 @@ export default function AppBar() {
   const [showMoreMenu, setShowMoreMenu] = useState(false);
   const [showDialog, setShowDialog] = useState(false);
   const [showDialogWait, setShowDialogWait] = useState(false);
-  const { viewMode, setViewMode } = useViewMode();
+  const { currentViewMode, setViewMode } = useViewMode();
   const { setDarkMode } = useDarkMode();
   const { send: sendRestart } = useRestart();
 
@@ -75,7 +75,7 @@ export default function AppBar() {
           <MenuItem icon={SettingsIcon} label="Viewmode:">
             <select
               className="py-0.5 pr-8"
-              value={viewMode}
+              value={currentViewMode}
               onChange={(e) => handleSetViewMode(e.target.value)}
             >
               { Object.keys(ViewModeTypes).filter((v) => !isNaN(Number(v))).map(key => <option key={key} value={key}>{ViewModeTypes[key]}</option>) }
diff --git a/web/src/app.tsx b/web/src/app.tsx
index 34c0da4cf..95f530982 100644
--- a/web/src/app.tsx
+++ b/web/src/app.tsx
@@ -16,7 +16,7 @@ export default function App() {
   return (
     <DarkModeProvider>
       <DrawerProvider>
-        <ViewModeProvider>
+        <ViewModeProvider config={config}>
           <div data-testid="app" className="w-full">
           <AppBar />
             {!config ? (
diff --git a/web/src/components/ViewOption.jsx b/web/src/components/ViewOption.jsx
index 0d9132d0c..3fb3f276a 100644
--- a/web/src/components/ViewOption.jsx
+++ b/web/src/components/ViewOption.jsx
@@ -3,9 +3,9 @@ import { useViewMode } from '../context';
 import { ViewModeTypes } from './ViewOptionEnum';
 
 export default function ViewOption({children, requiredmode }) {
-  const { viewMode } = useViewMode();
+  const { currentViewMode } = useViewMode();
 
-  return viewMode >= ViewModeTypes[requiredmode] ? (
+  return currentViewMode >= ViewModeTypes[requiredmode] ? (
     <>{children}</>
     
   ) : null;
diff --git a/web/src/context/index.jsx b/web/src/context/index.jsx
index 8e4ddcf1c..d85d52dda 100644
--- a/web/src/context/index.jsx
+++ b/web/src/context/index.jsx
@@ -2,24 +2,34 @@ import { h, createContext } from 'preact';
 import { get as getData, set as setData } from 'idb-keyval';
 import { useCallback, useContext, useEffect, useLayoutEffect, useState } from 'preact/hooks';
 import { ViewModeTypes } from '../components/ViewOptionEnum';
-import useSWR from 'swr';
 
-const ViewMode = createContext(null);
+const ViewMode = createContext("");
 
-export function ViewModeProvider({ children }) {
-  const [viewMode, setViewMode] = usePersistence('view-mode', null);
-  const { data: config } = useSWR('config');
+export function ViewModeProvider({ children, config }) {
+  const [currentViewMode, setCurrentViewMode] = useState(null);
+
+  const setViewMode = useCallback(
+    (value) => {
+      setData('view-mode', value);
+      setCurrentViewMode(value);
+    },
+    [setCurrentViewMode]
+  );
 
   useEffect(() => {
     async function load() {
-      const configValue = ViewModeTypes[config.ui.viewmode]; //fixes a load error
-      setViewMode(viewMode || configValue);
+      const configValue = config ? ViewModeTypes[config.ui.viewmode].toString() : "2";
+      const viewmode = await getData('view-mode');
+      setViewMode(viewmode || configValue);
     }
 
     load();
-  }, [setViewMode, config]);
+  }, [config, setViewMode]);
 
-  return <ViewMode.Provider value={{ viewMode, setViewMode }}>{children}</ViewMode.Provider>;
+  
+  return !currentViewMode ? null : (
+    <ViewMode.Provider value={{ currentViewMode, setViewMode }}>{children}</ViewMode.Provider>
+  );
 }
 
 export function useViewMode() {
diff --git a/web/src/routes/Cameras.jsx b/web/src/routes/Cameras.jsx
index 97457b8cf..a3644aa4c 100644
--- a/web/src/routes/Cameras.jsx
+++ b/web/src/routes/Cameras.jsx
@@ -88,9 +88,9 @@ function Camera({ name, config }) {
     [config, detectValue, sendDetect, recordValue, sendRecordings, snapshotValue, sendSnapshots]
   );
 
-  const { viewMode } = useViewMode();
+  const { currentViewMode } = useViewMode();
 
   return (
-    <Card buttons={buttons} href={href} header={cleanName} icons={viewMode >= ViewModeTypes["admin"] ? icons : []} media={<CameraImage camera={name} stretch />} />
+    <Card buttons={buttons} href={href} header={cleanName} icons={currentViewMode >= ViewModeTypes["admin"] ? icons : []} media={<CameraImage camera={name} stretch />} />
   );
 }