diff --git a/src/App.vue b/src/App.vue
index 70bcd79e5..247d164eb 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -58,11 +58,10 @@ export default {
 
     hasInStorage() {
       const mode = localStorage.getItem(this.LS_MODE);
-      return mode !== null;
+      return mode !== null && mode !== 'yellow';
     },
 
     setThemeMode(mode) {
-      this.saveThemeMode(mode);
       this.setTheme(mode);
       document.body.setAttribute('data-theme', mode);
     },
@@ -70,10 +69,6 @@ export default {
     getLocalThemeMode() {
       return localStorage.getItem(this.LS_MODE);
     },
-
-    saveThemeMode(mode) {
-      localStorage.setItem(this.LS_MODE, mode);
-    },
   },
 };
 
diff --git a/src/store/index.js b/src/store/index.js
index 7f0bf7627..2feff0290 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -114,8 +114,9 @@ export const getters = {
 export const actions = {
   ...moduleActions,
 
-  setTheme: async ({ commit }, payload) => {
+  setTheme: async ({ state, commit }, payload) => {
     commit('SET_THEME', payload);
+    localStorage.setItem(state.LS_MODE, payload);
 
     return true;
   },