diff --git a/components/lib/themes/actions/useTheme.js b/components/lib/themes/actions/useTheme.js
index c2af87405..d9d58147a 100644
--- a/components/lib/themes/actions/useTheme.js
+++ b/components/lib/themes/actions/useTheme.js
@@ -1,6 +1,7 @@
 import Theme from 'primevue/themes';
 
 export default (theme) => {
+    // @todo
     const [{ options: o1 }, { options: o2 }] = [Theme.getTheme(), theme];
     const newTheme = {
         ...theme,
diff --git a/components/lib/themes/config/index.js b/components/lib/themes/config/index.js
index faa21dd35..a31ccb64a 100644
--- a/components/lib/themes/config/index.js
+++ b/components/lib/themes/config/index.js
@@ -28,7 +28,7 @@ export default {
                     ...theme.options
                 }
             };
-            this._tokens = ThemeUtils.createTokens(theme?.preset, this.defaults);
+            this._tokens = ThemeUtils.createTokens(this.preset, this.defaults);
             this.clearLoadedStyleNames();
         }
     },