diff --git a/src/layout/components/setting/index.vue b/src/layout/components/setting/index.vue
index 9e00ac3a5..04fb9a49a 100644
--- a/src/layout/components/setting/index.vue
+++ b/src/layout/components/setting/index.vue
@@ -132,6 +132,8 @@ const multiTagsCacheChange = () => {
 /** 清空缓存并返回登录页 */
 function onReset() {
   router.push("/login");
+  storageLocal.clear();
+  storageSession.clear();
   const { Grey, Weak, MultiTagsCache, EpThemeColor, Layout } = getConfig();
   useAppStoreHook().setLayout(Layout);
   setEpThemeColor(EpThemeColor);
@@ -139,8 +141,6 @@ function onReset() {
   toggleClass(Grey, "html-grey", document.querySelector("html"));
   toggleClass(Weak, "html-weakness", document.querySelector("html"));
   useMultiTagsStoreHook().handleTags("equal", [...routerArrays]);
-  storageLocal.clear();
-  storageSession.clear();
   resetRouter();
 }
 
diff --git a/src/store/modules/epTheme.ts b/src/store/modules/epTheme.ts
index 4d14aece0..aac76ce59 100644
--- a/src/store/modules/epTheme.ts
+++ b/src/store/modules/epTheme.ts
@@ -34,6 +34,7 @@ export const useEpThemeStore = defineStore({
       const layout = storageLocal.getItem<StorageConfigs>("responsive-layout");
       this.epTheme = layout?.theme;
       this.epThemeColor = newColor;
+      if (!layout) return;
       layout.epThemeColor = newColor;
       storageLocal.setItem("responsive-layout", layout);
     }