diff --git a/common/src/app/common/types/tokens_lib.cljc b/common/src/app/common/types/tokens_lib.cljc
index aac99c0e9..61ab00160 100644
--- a/common/src/app/common/types/tokens_lib.cljc
+++ b/common/src/app/common/types/tokens_lib.cljc
@@ -147,10 +147,11 @@
   Token references are strings delimited by curly braces.
   E.g.: {foo.bar.baz} -> foo.bar.baz"
   [token-value]
-  (when (string? token-value)
+  (if (string? token-value)
     (some->> (re-seq #"\{([^}]*)\}" token-value)
              (map second)
-             (into #{}))))
+             (into #{}))
+    #{}))
 
 (defn token-value-self-reference?
   "Check if the token is self referencing with its `token-name` in `token-value`.