diff --git a/js/models/messages.js b/js/models/messages.js
index 11191e8a5..688f25cde 100644
--- a/js/models/messages.js
+++ b/js/models/messages.js
@@ -233,6 +233,7 @@
         resolveConflict: function(number) {
             var error = this.getKeyConflict(number);
             if (error) {
+                this.removeConflictFor(number);
                 var promise = new textsecure.ReplayableError(error).replay();
                 if (this.isIncoming()) {
                     promise = promise.then(function(dataMessage) {