diff --git a/www/common/cryptpad-common.js b/www/common/cryptpad-common.js
index 9c29fbe4d..001358651 100644
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -708,9 +708,11 @@ define([
                     var update = updateLocalVersion(NewConfig.requireConf && NewConfig.requireConf.urlArgs);
                     if (update) {
                         postMessage('DISCONNECT');
+                        return;
                     }
+                    common.onNetworkReconnect.fire(data);
                 });
-                common.onNetworkReconnect.fire(data); break;
+                break;
             }
             // Messenger
             case 'CONTACTS_MESSAGE': {
diff --git a/www/common/sframe-common.js b/www/common/sframe-common.js
index 6039ead70..5ab973476 100644
--- a/www/common/sframe-common.js
+++ b/www/common/sframe-common.js
@@ -443,6 +443,7 @@ define([
                 $err.find('a').click(function () {
                     funcs.gotoURL();
                 });
+                UI.findOKButton().click();
                 UI.errorLoadingScreen($err, true, true);
             });