diff --git a/cmd/server/main.go b/cmd/server/main.go
index 29b8a6588..5e93b7cd2 100644
--- a/cmd/server/main.go
+++ b/cmd/server/main.go
@@ -208,9 +208,12 @@ func getConfig(c *cli.Context) (*config.Config, error) {
 			if conf.BindAddresses == nil {
 				conf.BindAddresses = []string{
 					"127.0.0.1",
-					"[::1]",
+					"::1",
 				}
 			}
+			for _, bindAddr := range conf.BindAddresses {
+				conf.RTC.IPs.Includes = append(conf.RTC.IPs.Includes, bindAddr + "/24")
+			}
 		}
 	}
 	return conf, nil
diff --git a/pkg/service/server.go b/pkg/service/server.go
index 69e3d404c..c21b98fe0 100644
--- a/pkg/service/server.go
+++ b/pkg/service/server.go
@@ -10,6 +10,7 @@ import (
 	_ "net/http/pprof"
 	"runtime"
 	"runtime/pprof"
+	"strconv"
 	"time"
 
 	"github.com/pion/turn/v2"
@@ -177,14 +178,14 @@ func (s *LivekitServer) Start() error {
 	listeners := make([]net.Listener, 0)
 	promListeners := make([]net.Listener, 0)
 	for _, addr := range addresses {
-		ln, err := net.Listen("tcp", fmt.Sprintf("%s:%d", addr, s.config.Port))
+		ln, err := net.Listen("tcp", net.JoinHostPort(addr, strconv.Itoa(int(s.config.Port))))
 		if err != nil {
 			return err
 		}
 		listeners = append(listeners, ln)
 
 		if s.promServer != nil {
-			ln, err = net.Listen("tcp", fmt.Sprintf("%s:%d", addr, s.config.PrometheusPort))
+			ln, err = net.Listen("tcp", net.JoinHostPort(addr, strconv.Itoa(int(s.config.PrometheusPort))))
 			if err != nil {
 				return err
 			}