diff --git a/src/store/modules/d2admin.js b/src/store/modules/d2admin.js
index 8e3d4383..392f2e5a 100644
--- a/src/store/modules/d2admin.js
+++ b/src/store/modules/d2admin.js
@@ -241,7 +241,11 @@ export default {
      */
     d2adminThemeLoad (state) {
       const themeActiveName = db.get('themeActiveName').find({uuid: util.uuid()}).value()
-      this.commit('d2adminThemeSet', themeActiveName.value || state.themeList[0].name)
+      if (themeActiveName) {
+        this.commit('d2adminThemeSet', themeActiveName.value)
+      } else {
+        this.commit('d2adminThemeSet', state.themeList[0].name)
+      }
     }
   }
 }