diff --git a/frontend/src/app/main/refs.cljs b/frontend/src/app/main/refs.cljs
index 0598e90886..f1052dbc80 100644
--- a/frontend/src/app/main/refs.cljs
+++ b/frontend/src/app/main/refs.cljs
@@ -459,9 +459,6 @@
        (ctob/get-theme lib group name)))
    tokens-lib))
 
-(def workspace-token-theme-tree
-  (l/derived #(or (some-> % ctob/get-theme-tree) []) tokens-lib))
-
 (def workspace-token-theme-tree-no-hidden
   (l/derived (fn [lib]
                (or
@@ -493,13 +490,16 @@
   (l/derived #(some-> % ctob/get-active-themes-set-names) tokens-lib))
 
 (def workspace-active-theme-sets-tokens
-  (l/derived #(some-> % ctob/get-active-themes-set-tokens) tokens-lib))
+  (l/derived #(or (some-> % ctob/get-active-themes-set-tokens) {}) tokens-lib))
+
+(def workspace-selected-token-set-tokens
+  (l/derived #(or (wtts/get-selected-token-set-tokens %) {}) st/state))
 
 (dm/legacy
- (def workspace-selected-token-set-tokens
+ (def workspace-selected-token-set-tokens-OLD
    (l/derived
     (fn [data]
-      (or (wtts/get-selected-token-set-tokens data) {}))
+      {})
     st/state
     =)))
 
diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/menus/layout_container.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/menus/layout_container.cljs
index b758051d58..0092dac583 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/layout_container.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/layout_container.cljs
@@ -856,7 +856,7 @@
 
         shape (when-not multiple
                 (first (deref (refs/objects-by-id ids))))
-        tokens (mf/deref refs/workspace-selected-token-set-tokens)
+        tokens (mf/deref refs/workspace-selected-token-set-tokens-OLD)
         spacing-tokens (mf/use-memo (mf/deps tokens) #(:spacing (wtc/group-tokens-by-type-OLD tokens)))
 
         spacing-column-options (mf/use-memo
diff --git a/frontend/src/app/main/ui/workspace/tokens/context_menu.cljs b/frontend/src/app/main/ui/workspace/tokens/context_menu.cljs
index 6e4156d034..e4ce8b7955 100644
--- a/frontend/src/app/main/ui/workspace/tokens/context_menu.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/context_menu.cljs
@@ -312,7 +312,7 @@
         selected (mf/deref refs/selected-shapes)
         selected-shapes (into [] (keep (d/getf objects)) selected)
         token-id (:token-id mdata)
-        token (get (mf/deref refs/workspace-selected-token-set-tokens) token-id)
+        token (get (mf/deref refs/workspace-selected-token-set-tokens-OLD) token-id)
         selected-token-set-id (mf/deref refs/workspace-selected-token-set-id)]
     (mf/use-effect
      (mf/deps mdata)
diff --git a/frontend/src/app/main/ui/workspace/tokens/core.cljs b/frontend/src/app/main/ui/workspace/tokens/core.cljs
index 117e7b3df8..6fe482836a 100644
--- a/frontend/src/app/main/ui/workspace/tokens/core.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/core.cljs
@@ -66,6 +66,6 @@
     {:global global}))
 
 (defn download-tokens-as-json []
-  (let [all-tokens (deref refs/workspace-selected-token-set-tokens)
+  (let [all-tokens (deref refs/workspace-selected-token-set-tokens-OLD)
         transformed-tokens-json (transform-tokens-into-json-format all-tokens)]
     (export-tokens-file transformed-tokens-json)))
diff --git a/frontend/src/app/main/ui/workspace/tokens/form.cljs b/frontend/src/app/main/ui/workspace/tokens/form.cljs
index 2d04096383..ac90d9a42e 100644
--- a/frontend/src/app/main/ui/workspace/tokens/form.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/form.cljs
@@ -202,7 +202,7 @@ Token names should only contain letters and digits separated by . characters.")}
         color? (wtt/color-token? token)
         selected-set-tokens (mf/deref refs/workspace-selected-token-set-tokens)
         active-theme-tokens (mf/deref refs/workspace-active-theme-sets-tokens)
-        resolved-tokens (sd/use-resolved-tokens (vals active-theme-tokens)
+        resolved-tokens (sd/use-resolved-tokens active-theme-tokens
                                                 {:names-map? true
                                                  :cache-atom form-token-cache-atom})
         token-path (mf/use-memo
diff --git a/frontend/src/app/main/ui/workspace/tokens/token_set.cljs b/frontend/src/app/main/ui/workspace/tokens/token_set.cljs
index d3b5149280..20ebb5d81a 100644
--- a/frontend/src/app/main/ui/workspace/tokens/token_set.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/token_set.cljs
@@ -103,7 +103,7 @@
 
 (defn get-selected-token-set-tokens [state]
   (some-> (get-selected-token-set state)
-          (ctob/get-tokens)))
+          :tokens))
 
 (defn assoc-selected-token-set-id [state id]
   (assoc-in state [:workspace-local :selected-token-set-id] id))