diff --git a/js/models/core/Wallet.js b/js/models/core/Wallet.js
index c6236cf47..55bc54305 100644
--- a/js/models/core/Wallet.js
+++ b/js/models/core/Wallet.js
@@ -168,12 +168,15 @@ Wallet.prototype._optsToObj = function() {
     requiredCopayers: this.requiredCopayers,
     totalCopayers: this.totalCopayers,
     name: this.name,
-    token: this.token,
-    tokenTime: new Date().getTime(),
     netKey: this.netKey,
     version: this.version,
   };
 
+  if (this.token){
+    obj.token = this.token;
+    obj.tokenTime = new Date().getTime();
+  }
+
   return obj;
 };