diff --git a/www/common/cryptpad-common.js b/www/common/cryptpad-common.js
index c19baf0a9..a22f4d57e 100644
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -773,7 +773,7 @@ define([
                     waitFor.abort();
                     return void cb(obj);
                 }
-            }), true);
+            }));
             common.unpinPads([oldChannel], waitFor());
             common.pinPads([newSecret.channel], waitFor());
         }).nThen(function (waitFor) {
diff --git a/www/common/outer/async-store.js b/www/common/outer/async-store.js
index 0304a5006..8564189fd 100644
--- a/www/common/outer/async-store.js
+++ b/www/common/outer/async-store.js
@@ -244,7 +244,7 @@ define([
             // data.force tells us we can safely remove the drive ID
             var channel = data;
             var force = false;
-            if (typeof(data) === "object") {
+            if (data && typeof(data) === "object") {
                 channel = data.channel;
                 force = data.force;
             }
@@ -587,7 +587,10 @@ define([
                         }));
                     }).nThen(function (waitFor) {
                         // Delete Drive
-                        Store.removeOwnedChannel(clientId, secret.channel, waitFor());
+                        Store.removeOwnedChannel(clientId, {
+                            channel: secret.channel,
+                            force: true
+                        }, waitFor());
                     }).nThen(function () {
                         store.network.disconnect();
                         cb({