diff --git a/js/models/conversations.js b/js/models/conversations.js
index 7464b2e731..1818e2c637 100644
--- a/js/models/conversations.js
+++ b/js/models/conversations.js
@@ -55,6 +55,10 @@
         if (attributes.type !== 'private' && attributes.type !== 'group') {
             return "Invalid conversation type: " + attributes.type;
         }
+
+        if (!attributes.tokens) {
+            this.updateTokens();
+        }
     },
 
     updateTokens: function() {