diff --git a/src/webserver.js b/src/webserver.js
index c27a4e5d4a..13310bef92 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -277,9 +277,12 @@ async function listen() {
 		}
 	}
 	port = parseInt(port, 10);
-	if ((port !== 80 && port !== 443) || nconf.get('trust_proxy') === true) {
-		winston.info('🤝 Enabling \'trust proxy\'');
-		app.enable('trust proxy');
+
+	let trust_proxy = nconf.get('trust_proxy');
+	if (trust_proxy == null && ![80, 443].includes(port)) trust_proxy = true;
+	if (trust_proxy) {
+		winston.info(`🤝 Setting 'trust proxy' to ${JSON.stringify(trust_proxy)}`);
+		app.set('trust proxy', trust_proxy);
 	}
 
 	if ((port === 80 || port === 443) && process.env.NODE_ENV !== 'development') {