diff --git a/server/socket.js b/server/socket.js
index c5b9ee08..79762a01 100644
--- a/server/socket.js
+++ b/server/socket.js
@@ -686,7 +686,8 @@ utils.extend(SocketConnection.prototype, {
 		},
 
 		async geoip() {
-			return await geoip.lookup(this.socket.request.connection.remoteAddress);
+			let ip = this.socket.handshake.headers["x-forwarded-for"] || this.socket.request.connection.remoteAddress;
+			return await geoip.lookup(ip);
 		}
 
 		/*copyPad : function(data, callback) {