diff --git a/src/node/hooks/express/admin.js b/src/node/hooks/express/admin.js
index 0884cde5..5df45b18 100644
--- a/src/node/hooks/express/admin.js
+++ b/src/node/hooks/express/admin.js
@@ -5,5 +5,5 @@ exports.expressCreateServer = function (hook_name, args, cb) {
     if('/' != req.path[req.path.length-1]) return res.redirect('./admin/');
     res.send( eejs.require("ep_etherpad-lite/templates/admin/index.html", {}) );
   });
+  return cb();
 }
-
diff --git a/src/node/hooks/express/adminplugins.js b/src/node/hooks/express/adminplugins.js
index f6f184ed..3d5db155 100644
--- a/src/node/hooks/express/adminplugins.js
+++ b/src/node/hooks/express/adminplugins.js
@@ -27,6 +27,8 @@ exports.expressCreateServer = function(hook_name, args, cb) {
       latestVersion: UpdateCheck.getLatestVersion()
     }));
   });
+
+  return cb();
 }
 
 exports.socketio = function(hook_name, args, cb) {
@@ -111,6 +113,7 @@ exports.socketio = function(hook_name, args, cb) {
       });
     });
   });
+  return cb();
 }
 
 function sortPluginList(plugins, property, /*ASC?*/dir) {
diff --git a/src/node/hooks/express/adminsettings.js b/src/node/hooks/express/adminsettings.js
index 1ad48b11..98f30cf2 100644
--- a/src/node/hooks/express/adminsettings.js
+++ b/src/node/hooks/express/adminsettings.js
@@ -15,6 +15,7 @@ exports.expressCreateServer = function (hook_name, args, cb) {
     res.send( eejs.require("ep_etherpad-lite/templates/admin/settings.html", render_args) );
 
   });
+  return cb();
 }
 
 exports.socketio = function (hook_name, args, cb) {
@@ -53,4 +54,5 @@ exports.socketio = function (hook_name, args, cb) {
     });
 
   });
+  return cb();
 }
diff --git a/src/node/hooks/express/apicalls.js b/src/node/hooks/express/apicalls.js
index c0967c35..ed9f5a98 100644
--- a/src/node/hooks/express/apicalls.js
+++ b/src/node/hooks/express/apicalls.js
@@ -29,4 +29,6 @@ exports.expressCreateServer = function (hook_name, args, cb) {
   args.app.get('/api', function (req, res) {
      res.json({"currentVersion" : apiHandler.latestApiVersion});
   });
+
+  return cb();
 }
diff --git a/src/node/hooks/express/errorhandling.js b/src/node/hooks/express/errorhandling.js
index d4b8b89d..9863c6a5 100644
--- a/src/node/hooks/express/errorhandling.js
+++ b/src/node/hooks/express/errorhandling.js
@@ -12,4 +12,6 @@ exports.expressCreateServer = function (hook_name, args, cb) {
     console.error(err.stack? err.stack : err.toString());
     stats.meter('http500').mark()
   });
+
+  return cb();
 }
diff --git a/src/node/hooks/express/importexport.js b/src/node/hooks/express/importexport.js
index 6b376c0e..5a0b7242 100644
--- a/src/node/hooks/express/importexport.js
+++ b/src/node/hooks/express/importexport.js
@@ -71,4 +71,6 @@ exports.expressCreateServer = function (hook_name, args, cb) {
     }
     await importHandler.doImport(req, res, req.params.pad);
   });
+
+  return cb();
 }
diff --git a/src/node/hooks/express/openapi.js b/src/node/hooks/express/openapi.js
index bc7473b9..624f4eab 100644
--- a/src/node/hooks/express/openapi.js
+++ b/src/node/hooks/express/openapi.js
@@ -532,7 +532,7 @@ const generateDefinitionForVersion = (version, style = APIPathStyle.FLAT) => {
   return definition;
 };
 
-exports.expressCreateServer = async (_, args) => {
+exports.expressCreateServer = (hookName, args, cb) => {
   const { app } = args;
 
   // create openapi-backend handlers for each api version under /api/{version}/*
@@ -687,6 +687,7 @@ exports.expressCreateServer = async (_, args) => {
       });
     }
   }
+  return cb();
 };
 
 // helper to get api root
diff --git a/src/node/hooks/express/padreadonly.js b/src/node/hooks/express/padreadonly.js
index 5264c17c..486806d8 100644
--- a/src/node/hooks/express/padreadonly.js
+++ b/src/node/hooks/express/padreadonly.js
@@ -22,5 +22,5 @@ exports.expressCreateServer = function (hook_name, args, cb) {
       res.send(html);
     }
   });
-
+  return cb();
 }
diff --git a/src/node/hooks/express/padurlsanitize.js b/src/node/hooks/express/padurlsanitize.js
index ad8d3c43..7c603b2b 100644
--- a/src/node/hooks/express/padurlsanitize.js
+++ b/src/node/hooks/express/padurlsanitize.js
@@ -26,4 +26,5 @@ exports.expressCreateServer = function (hook_name, args, cb) {
       res.status(302).send('You should be redirected to <a href="' + real_url + '">' + real_url + '</a>');
     }
   });
+  return cb();
 }
diff --git a/src/node/hooks/express/socketio.js b/src/node/hooks/express/socketio.js
index aae450da..fbfea098 100644
--- a/src/node/hooks/express/socketio.js
+++ b/src/node/hooks/express/socketio.js
@@ -72,4 +72,6 @@ exports.expressCreateServer = function (hook_name, args, cb) {
   socketIORouter.addComponent("pad", padMessageHandler);
 
   hooks.callAll("socketio", {"app": args.app, "io": io, "server": args.server});
+
+  return cb();
 }
diff --git a/src/node/hooks/express/specialpages.js b/src/node/hooks/express/specialpages.js
index 2b5ea231..97715b62 100644
--- a/src/node/hooks/express/specialpages.js
+++ b/src/node/hooks/express/specialpages.js
@@ -87,5 +87,5 @@ exports.expressCreateServer = function (hook_name, args, cb) {
     });
   });
 
-
+  return cb();
 }
diff --git a/src/node/hooks/express/static.js b/src/node/hooks/express/static.js
index b8c6c9d5..2a925b26 100644
--- a/src/node/hooks/express/static.js
+++ b/src/node/hooks/express/static.js
@@ -55,4 +55,6 @@ exports.expressCreateServer = function (hook_name, args, cb) {
     res.write(JSON.stringify({"plugins": clientPlugins, "parts": clientParts}));
     res.end();
   });
+
+  return cb();
 }
diff --git a/src/node/hooks/express/tests.js b/src/node/hooks/express/tests.js
index cc115b79..1ed67a5c 100644
--- a/src/node/hooks/express/tests.js
+++ b/src/node/hooks/express/tests.js
@@ -61,6 +61,8 @@ exports.expressCreateServer = function (hook_name, args, cb) {
   args.app.get('/tests/frontend', function (req, res) {
     res.redirect('/tests/frontend/index.html');
   });
+
+  return cb();
 }
 
 const readdir = util.promisify(fs.readdir);
diff --git a/src/node/hooks/express/webaccess.js b/src/node/hooks/express/webaccess.js
index 2ee28f55..ce9571d3 100644
--- a/src/node/hooks/express/webaccess.js
+++ b/src/node/hooks/express/webaccess.js
@@ -198,4 +198,5 @@ exports.checkAccess = (req, res, next) => {
 
 exports.expressConfigure = (hook_name, args, cb) => {
   args.app.use(exports.checkAccess);
+  return cb();
 };
diff --git a/src/node/hooks/i18n.js b/src/node/hooks/i18n.js
index 0928b293..98acb9de 100644
--- a/src/node/hooks/i18n.js
+++ b/src/node/hooks/i18n.js
@@ -100,7 +100,7 @@ var generateLocaleIndex = function (locales) {
 }
 
 
-exports.expressCreateServer = function(n, args) {
+exports.expressCreateServer = function(n, args, cb) {
 
   //regenerate locales on server restart
   var locales = getAllLocales();
@@ -123,5 +123,5 @@ exports.expressCreateServer = function(n, args) {
     res.send(localeIndex);
   })
 
+  return cb();
 }
-