diff --git a/components/lib/basecomponent/BaseComponent.vue b/components/lib/basecomponent/BaseComponent.vue
index 4f3e01603..366346eb8 100644
--- a/components/lib/basecomponent/BaseComponent.vue
+++ b/components/lib/basecomponent/BaseComponent.vue
@@ -33,6 +33,9 @@ export default {
                 if (!newValue) {
                     BaseComponentStyle.loadStyle(this.$styleOptions);
                     this.$options.style && this.$style.loadStyle(this.$styleOptions);
+                } else {
+                    // load theme
+                    this._loadThemeStyles();
                 }
             }
         }
@@ -108,6 +111,8 @@ export default {
             ObjectUtils.isNotEmpty(globalCSS) && BaseStyle.loadStyle(globalCSS, { name: 'global', ...this.$styleOptions });
         },
         _loadThemeStyles() {
+            if (this.isUnstyled) return;
+
             // common
             if (!Theme.isStyleNameLoaded('common')) {
                 const { primitive, semantic, global } = this.$style?.getCommonThemeCSS?.() || {};
diff --git a/components/lib/basedirective/BaseDirective.js b/components/lib/basedirective/BaseDirective.js
index 0c019d596..2de2d7a1f 100644
--- a/components/lib/basedirective/BaseDirective.js
+++ b/components/lib/basedirective/BaseDirective.js
@@ -84,6 +84,8 @@ const BaseDirective = {
         ThemeService.on('theme:change', () => BaseDirective._loadThemeStyles(el.$instance, { nonce: config?.csp?.nonce }));
     },
     _loadThemeStyles: (instance = {}, useStyleOptions) => {
+        if (instance?.isUnstyled()) return;
+
         // common
         if (!Theme.isStyleNameLoaded('common')) {
             const { primitive, semantic, global } = instance.$style?.getCommonThemeCSS?.() || {};
@@ -181,6 +183,7 @@ const BaseDirective = {
                 handleHook('beforeUpdate', el, binding, vnode, prevVnode);
             },
             updated: (el, binding, vnode, prevVnode) => {
+                BaseDirective._loadStyles(el, binding, vnode);
                 handleHook('updated', el, binding, vnode, prevVnode);
             },
             beforeUnmount: (el, binding, vnode, prevVnode) => {