diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 6df68a3f9..d097994ca 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -629,7 +629,7 @@ define([
     };
     var getPadProperties = function (common, data, cb) {
         var $d = $('<div>');
-        if (!data || (!data.href && !data.roHref)) { return void cb(void 0, $d); }
+        if (!data) { return void cb(void 0, $d); }
 
         if (data.href) {
             $('<label>', {'for': 'cp-app-prop-link'}).text(Messages.editShare).appendTo($d);
diff --git a/www/common/cryptpad-common.js b/www/common/cryptpad-common.js
index 9ed46ce04..9e9e0495a 100644
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -1524,6 +1524,7 @@ define([
             var noSharedWorker = false;
             if (localStorage.CryptPad_noWorkers) {
                 noWorker = localStorage.CryptPad_noWorkers === '1';
+                noWorker = true;
                 console.error('WebWorker/SharedWorker state forced to ' + !noWorker);
             }
             Nthen(function (waitFor2) {
diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index 50682edb6..476cc0996 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -3803,7 +3803,8 @@ define([
             }
 
             if (manager.isSharedFolder(el)) {
-                delete data.roHref;
+                var ro = folders[el] && folders[el].version >= 2;
+                if (!ro) { delete data.roHref; }
                 //data.noPassword = true;
                 //data.noEditPassword = true;
                 data.noExpiration = true;
diff --git a/www/common/outer/sharedfolder.js b/www/common/outer/sharedfolder.js
index a118e04e3..ef6a9dddd 100644
--- a/www/common/outer/sharedfolder.js
+++ b/www/common/outer/sharedfolder.js
@@ -76,6 +76,12 @@ define([
 
         var parsed = Hash.parsePadUrl(href);
         var secret = Hash.getSecrets('drive', parsed.hash, data.password);
+        // If we don' have valid keys, abort and remove the proxy to make sure
+        // we don't block the drive permanently
+        if (!secret.keys) {
+            store.manager.deprecateProxy(id);
+            return void cb(null);
+        }
         var secondaryKey = secret.keys.secondaryKey;
 
         // If we try to load an existing shared folder (isNew === false) but this folder
@@ -232,21 +238,13 @@ define([
         var sf = allSharedFolders[oldChannel];
         if (!sf) { return void cb({ error: 'ENOTFOUND' }); }
         if (sf.rt && sf.rt.stop) {
-            sf.rt.stop();
+            try { sf.rt.stop(); } catch (e) {}
         }
         var nt = nThen;
         sf.teams.forEach(function (obj) {
             nt = nt(function (waitFor) {
                 var s = obj.store;
                 var sfId = obj.id;
-                // We can't update the password of a shared folder in a read-only team
-                if (s.manager.user.userObject.readOnly) {
-                    // Just deprecate the folder so that inner can stop displaying a folder no longer available
-                    if (s.manager.folders[sfId]) {
-                        s.manager.folders[sfId].proxy = { deprecated: true };
-                    }
-                    return;
-                }
                 var shared = Util.find(s.proxy, ['drive', UserObject.SHARED_FOLDERS]) || {};
                 if (!sfId || !shared[sfId]) { return; }
                 var sf = JSON.parse(JSON.stringify(shared[sfId]));
diff --git a/www/common/outer/team.js b/www/common/outer/team.js
index bc071cd07..ab85e3a34 100644
--- a/www/common/outer/team.js
+++ b/www/common/outer/team.js
@@ -41,12 +41,18 @@ define([
                             team.manager.user.userObject.getHref(data) : data.href;
                     var parsed = Hash.parsePadUrl(href);
                     var secret = Hash.getSecrets(parsed.type, parsed.hash, o);
-                    SF.updatePassword(ctx.Store, {
-                        oldChannel: secret.channel,
-                        password: n,
-                        href: href
-                    }, ctx.store.network, function () {
-                        console.log('Shared folder password changed');
+                    // We've received a new password, we should update it locally
+                    // NOTE: this is an async call because new password means new roHref!
+                    // We need to wait for the new roHref in the proxy before calling the handlers
+                    // because a read-only team will use it when connecting to the new channel
+                    setTimeout(function () {
+                        SF.updatePassword(ctx.Store, {
+                            oldChannel: secret.channel,
+                            password: n,
+                            href: href
+                        }, ctx.store.network, function () {
+                            console.log('Shared folder password changed');
+                        });
                     });
                     return false;
                 }
diff --git a/www/common/proxy-manager.js b/www/common/proxy-manager.js
index bcbd240fb..977aeaf6d 100644
--- a/www/common/proxy-manager.js
+++ b/www/common/proxy-manager.js
@@ -59,7 +59,7 @@ define([
             }
             return void Env.Store.refreshDriveUI();
         }
-        Env.unpinPads([channel], function () {});
+        if (channel) { Env.unpinPads([channel], function () {}); }
         Env.user.userObject.deprecateSharedFolder(id);
         if (Env.Store && Env.Store.refreshDriveUI) {
             Env.Store.refreshDriveUI();
@@ -200,11 +200,12 @@ define([
         var obj = Env.folders[id].proxy.metadata || {};
         for (var k in Env.user.proxy[UserObject.SHARED_FOLDERS][id] || {}) {
             var data = JSON.parse(JSON.stringify(Env.user.proxy[UserObject.SHARED_FOLDERS][id][k]));
-            if (data.href && data.href.indexOf('#') === -1) {
+            if (k === "href" && data.indexOf('#') === -1) {
                 try {
-                    data.href = Env.user.userObject.cryptor.decrypt(data.href);
+                    data = Env.user.userObject.cryptor.decrypt(data);
                 } catch (e) {}
             }
+            if (k === "href" && data.indexOf('#') === -1) { data = undefined; }
             obj[k] = data;
         }
         return obj;
@@ -561,8 +562,9 @@ define([
             var secret = Hash.getSecrets(parsed.type, parsed.hash, newPassword);
             data.password = newPassword;
             data.channel = secret.channel;
-            var _href = '/drive/#'+Hash.getEditHashFromKeys(secret);
-            data.href = Env.user.userObject.cryptor.encrypt(_href);
+            if (secret.keys.editKeyStr) {
+                data.href = '/drive/#'+Hash.getEditHashFromKeys(secret);
+            }
             data.roHref = '/drive/#'+Hash.getViewHashFromKeys(secret);
             _addSharedFolder(Env, {
                 path: ['root'],
diff --git a/www/common/userObject.js b/www/common/userObject.js
index 74ed702d7..b85075329 100644
--- a/www/common/userObject.js
+++ b/www/common/userObject.js
@@ -106,7 +106,8 @@ define([
 
         exp.setReadOnly = function (state, key) {
             config.editKey = key;
-            createCryptor(key);
+            exp.cryptor = createCryptor(key);
+            exp.cryptor.k = Math.random();
             exp.readOnly = state;
             if (exp._setReadOnly) {
                 // Change outer
diff --git a/www/teams/inner.js b/www/teams/inner.js
index ebe06e248..ffbd26f32 100644
--- a/www/teams/inner.js
+++ b/www/teams/inner.js
@@ -67,6 +67,9 @@ define([
                     if (manager && oldIds.indexOf(fId) === -1) {
                         manager.addProxy(fId, { proxy: folders[fId] }, null, secret.keys.secondaryKey);
                     }
+                    var readOnly = !secret.keys.editKeyStr;
+                    if (!manager || !manager.folders[fId]) { return; }
+                    manager.folders[fId].userObject.setReadOnly(readOnly, secret.keys.secondaryKey);
                 }));
             });
         }).nThen(function () {