diff --git a/web/lib/mobx/store-init.tsx b/web/lib/mobx/store-init.tsx
index 5c2ee0558cc..771d8eaba20 100644
--- a/web/lib/mobx/store-init.tsx
+++ b/web/lib/mobx/store-init.tsx
@@ -24,9 +24,12 @@ const MobxStoreInit = () => {
       );
 
     // theme
-    if (store.theme.theme === null && store?.user?.currentUserSettings) {
+    if (
+      (store.theme.theme === null || store.theme.theme === "undefined") &&
+      store?.user?.currentUserSettings
+    ) {
       let currentTheme = localStorage.getItem("theme");
-      currentTheme = currentTheme ? currentTheme : "system";
+      currentTheme = currentTheme && currentTheme != "undefined" ? currentTheme : "system";
 
       // validating the theme and applying for initial state
       if (currentTheme) {