diff --git a/index.js b/index.js
index babf811..e1b98e5 100644
--- a/index.js
+++ b/index.js
@@ -161,9 +161,15 @@ Mod.prototype.callback = function (req, res, serverconsole, responseEnd, href, e
           ext: {}
         },
         serverSoftware: software,
-        remoteAddr: (req.socket.realRemoteAddress ? req.socket.realRemoteAddress : ((req.headers["x-forwarded-for"] && configJSON.enableIPSpoofing) ? req.headers["x-forwarded-for"].split(",")[0].replace(/ /g, "") : req.socket.remoteAddress)).replace(/^::ffff:/i, ""),
-        remotePost: (req.socket.realRemotePort ? req.socket.realRemotePort : req.socket.remotePort)
+        remoteAddr: (req.socket.realRemoteAddress ? req.socket.realRemoteAddress : ((req.headers["x-forwarded-for"] && configJSON.enableIPSpoofing) ? req.headers["x-forwarded-for"].split(",")[0].replace(/ /g, "") : req.socket.remoteAddress)).replace(/^::ffff:/i, "")
       };
+
+      if(req.socket.realRemoteAddress && req.socket.realRemotePort) {
+        jsgiRequestObject.remotePort = req.socket.realRemotePort;
+      } else if(!(req.socket.realRemoteAddress && !req.socket.realRemotePort)) {
+        jsgiRequestObject.remotePort = req.socket.remotePort;
+      }
+
       if (req.headers.authorization) {
         jsgiRequestObject.authType = req.headers.authorization.split(" ")[0];
         if (jsgiRequestObject.authType == "Basic") {