diff --git a/common/src/app/common/files/migrations.cljc b/common/src/app/common/files/migrations.cljc
index c72a76c706..91f5793e99 100644
--- a/common/src/app/common/files/migrations.cljc
+++ b/common/src/app/common/files/migrations.cljc
@@ -1615,7 +1615,7 @@
 
 (defmethod migrate-data "0014-fix-tokens-lib-duplicate-ids"
   [data _]
-  (update data :tokens-lib types.tokens-lib/fix-duplicate-token-set-ids))
+  (d/update-when data :tokens-lib types.tokens-lib/fix-duplicate-token-set-ids))
 
 (def available-migrations
   (into (d/ordered-set)
diff --git a/common/src/app/common/types/tokens_lib.cljc b/common/src/app/common/types/tokens_lib.cljc
index 48a17afbd0..9191aa3a2f 100644
--- a/common/src/app/common/types/tokens_lib.cljc
+++ b/common/src/app/common/types/tokens_lib.cljc
@@ -1899,9 +1899,10 @@ Will return a value that matches this schema:
                 node))
             (d/update-vals node recurse)))]
 
-    (-> (datafy tokens-lib)
-        (update :sets d/update-vals migrate-set-node)
-        (map->tokens-lib))))
+    (some-> tokens-lib
+            (-> (datafy)
+                (update :sets d/update-vals migrate-set-node)
+                (map->tokens-lib)))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; SERIALIZATION (FRESIAN)