diff --git a/src/modules/interface.js b/src/modules/interface.js
index 26bfe2955..c08ca4e49 100644
--- a/src/modules/interface.js
+++ b/src/modules/interface.js
@@ -490,6 +490,8 @@ const interfaceMod = {
         )
         state.styleNameUsed = style.nameUsed
         state.styleDataUsed = style.dataUsed
+        state.themeDataUsed = null
+        state.themeNameUsed = null
       } else {
         const theme = await getData(
           'theme',
@@ -497,8 +499,12 @@ const interfaceMod = {
           userThemeV2Source || userThemeV2Snapshot,
           userThemeV2Name || instanceThemeV2Name
         )
-        // themeNameUsed = theme.nameUsed
+        state.themeNameUsed = theme.nameUsed
         state.themeDataUsed = theme.dataUsed
+        state.styleNameUsed = null
+        state.styleDataUsed = null
+        state.paletteNameUsed = null
+        state.paletteDataUsed = null
       }
     },
     async applyTheme (
@@ -519,10 +525,6 @@ const interfaceMod = {
       }
       await dispatch('getThemeData')
 
-      // commit('setOption', { name: 'palette', value: paletteNameUsed })
-      // commit('setOption', { name: 'style', value: styleNameUsed })
-      // commit('setOption', { name: 'theme', value: themeNameUsed })
-
       const paletteIss = (() => {
         if (!state.paletteDataUsed) return null
         const result = {