diff --git a/core/server/server.js b/core/server/server.js
index e7bde6c9f3b48..962f7be79c623 100644
--- a/core/server/server.js
+++ b/core/server/server.js
@@ -319,6 +319,8 @@ class Server {
         // On Fly we can use the Fly-Client-IP header
         // https://fly.io/docs/reference/runtime-environment/#request-headers
         req.ip = req.headers['fly-client-ip']
+          ? req.headers['fly-client-ip']
+          : req.socket.remoteAddress
       } else {
         req.ip = req.socket.remoteAddress
       }