diff --git a/NetfluxWebsocketSrv.js b/NetfluxWebsocketSrv.js
index b8c4f5a2a..3bad068d5 100644
--- a/NetfluxWebsocketSrv.js
+++ b/NetfluxWebsocketSrv.js
@@ -232,7 +232,9 @@ const handleMessage = function (ctx, user, msg) {
                 // slice off the sequence number and pass in the rest of the message
                 ctx.rpc(ctx, rpc_call, function (err, output) {
                     if (err) {
-                        console.error('[' + err + ']', output); // TODO make this disableable
+                        if (!ctx.config.suppressRPCErrors) {
+                            console.error('[' + err + ']', output);
+                        }
                         sendMsg(ctx, user, [seq, 'ACK']);
                         sendMsg(ctx, user, [0, HISTORY_KEEPER_ID, 'MSG', user.id, JSON.stringify([parsed[0], 'ERROR', err])]);
                         return
diff --git a/config.js.dist b/config.js.dist
index 3818ae002..479949b74 100644
--- a/config.js.dist
+++ b/config.js.dist
@@ -137,6 +137,11 @@ module.exports = {
      */
     rpc: './rpc.js',
 
+    /*  RPC errors are shown by default, but if you really don't care,
+     *  you can suppress them
+     */
+    suppressRPCErrors: false,
+
     /* it is recommended that you serve cryptpad over https
      * the filepaths below are used to configure your certificates
      */