diff --git a/js/signal_protocol_store.js b/js/signal_protocol_store.js
index cde5d7df0..e3beac5b9 100644
--- a/js/signal_protocol_store.js
+++ b/js/signal_protocol_store.js
@@ -267,10 +267,13 @@
         },
         removeSignedPreKey: function(keyId) {
             var prekey = new SignedPreKey({id: keyId});
-            return new Promise(function(resolve) {
-                prekey.destroy().then(function() {
-                    resolve();
-                });
+            return new Promise(function(resolve, reject) {
+                var deferred = prekey.destroy();
+                if (!deferred) {
+                    return resolve();
+                }
+
+                deferred.then(resolve, reject);
             });
         },