diff --git a/services/web/app/src/infrastructure/Server.js b/services/web/app/src/infrastructure/Server.js
index b9bc7e836b..4994381042 100644
--- a/services/web/app/src/infrastructure/Server.js
+++ b/services/web/app/src/infrastructure/Server.js
@@ -72,6 +72,13 @@ if (Settings.behindProxy) {
     next()
   })
 }
+if (Settings.exposeHostname) {
+  const HOSTNAME = require('os').hostname()
+  app.use((req, res, next) => {
+    res.setHeader('X-Served-By', HOSTNAME)
+    next()
+  })
+}
 
 webRouter.use(
   express.static(Path.join(__dirname, '/../../../public'), {
diff --git a/services/web/config/settings.defaults.coffee b/services/web/config/settings.defaults.coffee
index 3b37aec294..331b05adcb 100644
--- a/services/web/config/settings.defaults.coffee
+++ b/services/web/config/settings.defaults.coffee
@@ -418,6 +418,9 @@ module.exports = settings =
 	# address and http/https protocol information.
 	behindProxy: false
 
+	# Expose the hostname in the `X-Served-By` response header
+	exposeHostname: process.env['EXPOSE_HOSTNAME'] == 'true'
+
 	# Cookie max age (in milliseconds). Set to false for a browser session.
 	cookieSessionLength: 5 * 24 * 60 * 60 * 1000 # 5 days