diff --git a/common/src/app/common/types/tokens_theme_list.cljc b/common/src/app/common/types/tokens_theme_list.cljc
index 966016b02..64dab3c04 100644
--- a/common/src/app/common/types/tokens_theme_list.cljc
+++ b/common/src/app/common/types/tokens_theme_list.cljc
@@ -23,7 +23,7 @@
                 (let [exists? (some (partial = id) token-set-groups)]
                   (cond
                     exists?      token-set-groups
-                    (nil? index) (conj token-set-groups id)
+                    (nil? index) (conj (or token-set-groups []) id)
                     :else        (d/insert-at-index token-set-groups index [id])))))
       (update :token-sets-index assoc id token-set)))