diff --git a/packages/uniwind/src/core/config/config.native.ts b/packages/uniwind/src/core/config/config.native.ts
index 3ef10cc7..fb783f4c 100644
--- a/packages/uniwind/src/core/config/config.native.ts
+++ b/packages/uniwind/src/core/config/config.native.ts
@@ -39,11 +39,14 @@ class UniwindConfigBuilder extends UniwindConfigBuilderBase {
             const value = getValue()
             const runtimeThemeVariables = UniwindStore.runtimeThemeVariables.get(theme) ?? {}
 
-            Object.defineProperty(UniwindStore.vars, varName, {
-                configurable: true,
-                enumerable: true,
-                get: () => value,
-            })
+            if (theme === this.currentTheme) {
+                Object.defineProperty(UniwindStore.vars, varName, {
+                    configurable: true,
+                    enumerable: true,
+                    get: () => value,
+                })
+            }
+
             Object.defineProperty(runtimeThemeVariables, varName, {
                 configurable: true,
                 enumerable: true,
diff --git a/packages/uniwind/src/core/config/config.ts b/packages/uniwind/src/core/config/config.ts
index 211d2291..b659fa59 100644
--- a/packages/uniwind/src/core/config/config.ts
+++ b/packages/uniwind/src/core/config/config.ts
@@ -23,7 +23,10 @@ class UniwindConfigBuilder extends UniwindConfigBuilderBase {
 
             runtimeCSSVariables[varName] = varValue
             this.runtimeCSSVariables.set(theme, runtimeCSSVariables)
-            this.applyCSSVariable(varName, varValue)
+
+            if (theme === this.currentTheme) {
+                this.applyCSSVariable(varName, varValue)
+            }
         })
 
         if (theme === this.currentTheme) {