diff --git a/service/xboard/service.go b/service/xboard/service.go
index 486e0aa3..de17112b 100644
--- a/service/xboard/service.go
+++ b/service/xboard/service.go
@@ -557,7 +557,9 @@ func (s *Service) setupNode() error {
 		inner.Protocol = config.NodeType
 	}
 	if inner.Port == 0 {
-		if config.Port != 0 {
+		if inner.ServerPort != 0 {
+			inner.Port = inner.ServerPort
+		} else if config.Port != 0 {
 			inner.Port = config.Port
 		} else {
 			inner.Port = config.ServerPort