diff --git a/js/axolotl_store.js b/js/axolotl_store.js
index 398e268a1..dd2732516 100644
--- a/js/axolotl_store.js
+++ b/js/axolotl_store.js
@@ -123,6 +123,12 @@
         },
         removePreKey: function(keyId) {
             var prekey = new PreKey({id: keyId});
+
+            new Promise(function(resolve) {
+                var accountManager = new textsecure.AccountManager();
+                accountManager.refreshPreKeys().then(resolve);
+            });
+
             return new Promise(function(resolve) {
                 prekey.destroy().then(function() {
                     resolve();
diff --git a/js/libtextsecure.js b/js/libtextsecure.js
index 1b409aca2..0f05c54f7 100644
--- a/js/libtextsecure.js
+++ b/js/libtextsecure.js
@@ -39443,7 +39443,7 @@ window.textsecure.api = function () {
         refreshPreKeys: function() {
             return textsecure.api.getMyKeys().then(function(preKeyCount) {
                 if (preKeyCount < 10) {
-                    return generateKeys(100);
+                    return generateKeys(100).then(TextSecureServer.registerKeys);
                 }
             });
         }
diff --git a/libtextsecure/account_manager.js b/libtextsecure/account_manager.js
index d74393e41..7eb7d07f3 100644
--- a/libtextsecure/account_manager.js
+++ b/libtextsecure/account_manager.js
@@ -74,7 +74,7 @@
         refreshPreKeys: function() {
             return textsecure.api.getMyKeys().then(function(preKeyCount) {
                 if (preKeyCount < 10) {
-                    return generateKeys(100);
+                    return generateKeys(100).then(TextSecureServer.registerKeys);
                 }
             });
         }