diff --git a/js/libtextsecure.js b/js/libtextsecure.js
index 499a43b062..9bbf3e711d 100644
--- a/js/libtextsecure.js
+++ b/js/libtextsecure.js
@@ -38908,6 +38908,10 @@ OutgoingMessage.prototype = {
                             this.registerError(number, "Failed to reload device keys", error);
                         }.bind(this));
                 }.bind(this));
+            } else if (error.message === "Identity key changed") {
+                error = new textsecure.OutgoingIdentityKeyError(
+                    number, this.message.toArrayBuffer(), this.timestamp);
+                this.registerError(number, "Identity key changed", error);
             } else {
                 this.registerError(number, "Failed to create or send message", error);
             }
diff --git a/libtextsecure/outgoing_message.js b/libtextsecure/outgoing_message.js
index 809708e466..cc8e1e844b 100644
--- a/libtextsecure/outgoing_message.js
+++ b/libtextsecure/outgoing_message.js
@@ -172,6 +172,10 @@ OutgoingMessage.prototype = {
                             this.registerError(number, "Failed to reload device keys", error);
                         }.bind(this));
                 }.bind(this));
+            } else if (error.message === "Identity key changed") {
+                error = new textsecure.OutgoingIdentityKeyError(
+                    number, this.message.toArrayBuffer(), this.timestamp);
+                this.registerError(number, "Identity key changed", error);
             } else {
                 this.registerError(number, "Failed to create or send message", error);
             }