diff --git a/js/models/conversations.js b/js/models/conversations.js
index c5b6a2bce..a00503589 100644
--- a/js/models/conversations.js
+++ b/js/models/conversations.js
@@ -504,26 +504,24 @@
             throw 'No conflicts to resolve';
         }
 
-        return textsecure.storage.protocol.removeIdentityKey(number).then(function() {
-            return textsecure.storage.protocol.saveIdentity(number, identityKey).then(function() {
-                var promise = Promise.resolve();
-                var conflicts = this.messageCollection.filter(function(message) {
-                    return message.hasKeyConflict(number);
-                });
-                // group incoming & outgoing
-                conflicts = _.groupBy(conflicts, function(m) { return m.get('type'); });
-                // sort each group by date and concatenate outgoing after incoming
-                conflicts = _.flatten([
-                    _.sortBy(conflicts.incoming, function(m) { return m.get('received_at'); }),
-                    _.sortBy(conflicts.outgoing, function(m) { return m.get('received_at'); }),
-                ]).forEach(function(message) {
-                    var resolveConflict = function() {
-                        return message.resolveConflict(number);
-                    };
-                    promise = promise.then(resolveConflict, resolveConflict);
-                });
-                return promise;
-            }.bind(this));
+        return textsecure.storage.protocol.saveIdentity(number, identityKey).then(function() {
+            var promise = Promise.resolve();
+            var conflicts = this.messageCollection.filter(function(message) {
+                return message.hasKeyConflict(number);
+            });
+            // group incoming & outgoing
+            conflicts = _.groupBy(conflicts, function(m) { return m.get('type'); });
+            // sort each group by date and concatenate outgoing after incoming
+            conflicts = _.flatten([
+                _.sortBy(conflicts.incoming, function(m) { return m.get('received_at'); }),
+                _.sortBy(conflicts.outgoing, function(m) { return m.get('received_at'); }),
+            ]).forEach(function(message) {
+                var resolveConflict = function() {
+                    return message.resolveConflict(number);
+                };
+                promise = promise.then(resolveConflict, resolveConflict);
+            });
+            return promise;
         }.bind(this));
     },
     notify: function(message) {
diff --git a/js/signal_protocol_store.js b/js/signal_protocol_store.js
index a17e38177..b05124d39 100644
--- a/js/signal_protocol_store.js
+++ b/js/signal_protocol_store.js
@@ -293,12 +293,10 @@
                     if (!oldpublicKey || equalArrayBuffers(oldpublicKey, publicKey)) {
                         resolve(true);
                     } else if (!storage.get('safety-numbers-approval', true)) {
-                        this.removeIdentityKey(identifier).then(function() {
-                            this.saveIdentity(identifier, publicKey).then(function() {
-                                console.log('Key changed for', identifier);
-                                this.trigger('keychange', identifier);
-                                resolve(true);
-                            }.bind(this));
+                        this.saveIdentity(identifier, publicKey).then(function() {
+                            console.log('Key changed for', identifier);
+                            this.trigger('keychange', identifier);
+                            resolve(true);
                         }.bind(this));
                     } else {
                         resolve(false);