diff --git a/src/js/fields/advanced/TokenField.js b/src/js/fields/advanced/TokenField.js
index 43083330a..79f329574 100644
--- a/src/js/fields/advanced/TokenField.js
+++ b/src/js/fields/advanced/TokenField.js
@@ -35,6 +35,11 @@
             {
                 this.options.tokenfield.showAutocompleteOnFocus = true;
             }
+
+            //add initial data to tokenfield options
+            if (!Alpaca.isEmpty(this.data) && !this.options.tokenfield.tokens) {
+              this.options.tokenfield.tokens = this.data;
+            }
         },
 
         /**