diff --git a/www/common/cryptpad-common.js b/www/common/cryptpad-common.js
index d11c4eb1b..06e216d58 100644
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -1054,11 +1054,13 @@ define([
 
     var timeout = false;
     var onTimeout = function () {
-        // XXX
+        return;
+        /*
         timeout = true;
         common.onNetworkDisconnect.fire();
         // FIXME: no UI in outer...
         window.alert("Timeout error, please reload this tab");
+        */
     };
 
     var queries = {
diff --git a/www/common/outer/async-store.js b/www/common/outer/async-store.js
index 0ff44e651..7be78a893 100644
--- a/www/common/outer/async-store.js
+++ b/www/common/outer/async-store.js
@@ -1593,6 +1593,7 @@ define([
                 broadcast([], 'NETWORK_RECONNECT', {myId: info.myId});
             });
 
+            /*
             // Ping clients regularly to make sure one tab was not closed without sending a removeClient()
             // command. This allow us to avoid phantom viewers in pads.
             var PING_INTERVAL = 30000;
@@ -1625,7 +1626,7 @@ define([
                     ping();
                 });
             }, PING_INTERVAL);
-
+            */
         };
 
         /**