diff --git a/js/models/conversations.js b/js/models/conversations.js
index a00503589..06f156174 100644
--- a/js/models/conversations.js
+++ b/js/models/conversations.js
@@ -504,7 +504,7 @@
             throw 'No conflicts to resolve';
         }
 
-        return textsecure.storage.protocol.saveIdentity(number, identityKey).then(function() {
+        return textsecure.storage.protocol.saveIdentity(number, identityKey, true, true).then(function() {
             var promise = Promise.resolve();
             var conflicts = this.messageCollection.filter(function(message) {
                 return message.hasKeyConflict(number);
diff --git a/libtextsecure/account_manager.js b/libtextsecure/account_manager.js
index 14dab6515..ad0a43a03 100644
--- a/libtextsecure/account_manager.js
+++ b/libtextsecure/account_manager.js
@@ -204,7 +204,7 @@
                     // update our own identity key, which may have changed
                     // if we're relinking after a reinstall on the master device
                     var putIdentity = textsecure.storage.protocol.saveIdentity.bind(
-                        null, number, identityKeyPair.pubKey
+                        null, number, identityKeyPair.pubKey, true, true
                     );
                     textsecure.storage.protocol.removeIdentityKey(number).then(putIdentity, putIdentity);