diff --git a/lib/server.js b/lib/server.js
index b83f721..5606fdb 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -27,7 +27,12 @@ function setupRoutes() {
 function handleRequest(req, res) {
 	var requestUrl = url.parse(req.url).pathname;
 
-	logger.log('info', '%s requested: %s', req.connection.remoteAddress, requestUrl);
+	let remoteAddress = req.connection.remoteAddress;
+	if (req.headers && (req.headers['cf-connecting-ip'] || req.headers['x-forwarded-for'])) {
+		remoteAddress = req.headers['cf-connecting-ip'] || req.headers['x-forwarded-for'];
+	}
+
+	logger.log('info', '%s requested: %s', remoteAddress, requestUrl);
 
 	if (requestUrl === '/publicConfig.json') {
 		res.setHeader('Content-Type', 'application/javascript');