diff --git a/server/src/main/scala/net/psforever/server/Server.scala b/server/src/main/scala/net/psforever/server/Server.scala
index 8bd355614..ee1ce7b36 100644
--- a/server/src/main/scala/net/psforever/server/Server.scala
+++ b/server/src/main/scala/net/psforever/server/Server.scala
@@ -78,6 +78,11 @@ object Server {
 
   def run(args: CliConfig): Unit = {
     val bindAddress: InetAddress =
+      args.bind match {
+        case Some(address) => InetAddress.getByName(address)         // address from first argument
+        case None          => InetAddress.getByName(Config.app.bind) // address from config
+      }
+    val publicAddress: InetAddress =
       args.bind match {
         case Some(address) => InetAddress.getByName(address)           // address from first argument
         case None          => InetAddress.getByName(Config.app.public) // address from config
@@ -137,7 +142,7 @@ object Server {
     system.spawn(
       SocketPane(Seq(
         SocketSetup("login", SocketSetupInfo(bindAddress, Seq(Config.app.login.port), loginPlan)),
-        SocketSetup("world", SocketSetupInfo(bindAddress, Config.app.world.port +: Config.app.world.ports, sessionPlan))
+        SocketSetup("world", SocketSetupInfo(publicAddress, Config.app.world.port +: Config.app.world.ports, sessionPlan))
       )),
       name = SocketPane.SocketPaneKey.id
     )