diff --git a/common/src/app/common/types/tokens_lib.cljc b/common/src/app/common/types/tokens_lib.cljc
index 5323e5484e..a802679a2c 100644
--- a/common/src/app/common/types/tokens_lib.cljc
+++ b/common/src/app/common/types/tokens_lib.cljc
@@ -1767,7 +1767,14 @@ Will return a value that matches this schema:
            themes        (fres/read-object! r)
            active-themes (fres/read-object! r)
 
-           sets (d/update-vals sets make-token-set)]
+           migrate-sets-node
+           (fn recurse [node]
+             (if (token-set-legacy? node)
+               (make-token-set node)
+               (d/update-vals node recurse)))
+
+           sets
+           (d/update-vals sets migrate-sets-node)]
 
        (->TokensLib sets themes active-themes))))