diff --git a/go.mod b/go.mod
index 8ec9cd47e..4c01e2787 100644
--- a/go.mod
+++ b/go.mod
@@ -18,8 +18,8 @@ require (
 	github.com/jxskiss/base62 v1.1.0
 	github.com/livekit/mageutil v0.0.0-20230125210925-54e8a70427c1
 	github.com/livekit/mediatransportutil v0.0.0-20231017082622-43f077b4e60e
-	github.com/livekit/protocol v1.8.1-0.20231024024326-07ca9d4e47bd
-	github.com/livekit/psrpc v0.4.0
+	github.com/livekit/protocol v1.8.2-0.20231026030639-f8b1277b3c7b
+	github.com/livekit/psrpc v0.5.0
 	github.com/mackerelio/go-osstat v0.2.4
 	github.com/magefile/mage v1.15.0
 	github.com/maxbrunsfeld/counterfeiter/v6 v6.7.0
diff --git a/go.sum b/go.sum
index 53e811338..630b60db0 100644
--- a/go.sum
+++ b/go.sum
@@ -125,10 +125,10 @@ github.com/livekit/mageutil v0.0.0-20230125210925-54e8a70427c1 h1:jm09419p0lqTkD
 github.com/livekit/mageutil v0.0.0-20230125210925-54e8a70427c1/go.mod h1:Rs3MhFwutWhGwmY1VQsygw28z5bWcnEYmS1OG9OxjOQ=
 github.com/livekit/mediatransportutil v0.0.0-20231017082622-43f077b4e60e h1:yNeIo7MSMUWgoLu7LkNKnBYnJBFPFH9Wq4S6h1kS44M=
 github.com/livekit/mediatransportutil v0.0.0-20231017082622-43f077b4e60e/go.mod h1:+WIOYwiBMive5T81V8B2wdAc2zQNRjNQiJIcPxMTILY=
-github.com/livekit/protocol v1.8.1-0.20231024024326-07ca9d4e47bd h1:5By2nxIMS9MApyJ654STmtwb0V4MeuaH77lqUTxV3nw=
-github.com/livekit/protocol v1.8.1-0.20231024024326-07ca9d4e47bd/go.mod h1:oTWtPGfpZSJGKRrbSvDQK0jiuUylYzhiw/bnGB4Cqko=
-github.com/livekit/psrpc v0.4.0 h1:oC4l99HSot/aUza4ZR3ZcZW1SRZm34KCHX3wAbmw6Lo=
-github.com/livekit/psrpc v0.4.0/go.mod h1:1XYH1LLoD/YbvBvt6xg2KQ/J3InLXSJK6PL/+DKmuAU=
+github.com/livekit/protocol v1.8.2-0.20231026030639-f8b1277b3c7b h1:ExuLaXyk6pGe2DVgXef7YQB0BNA7eDxidmthSkfGB2w=
+github.com/livekit/protocol v1.8.2-0.20231026030639-f8b1277b3c7b/go.mod h1:l2WjlZWErS6vBlQaQyCGwWLt1aOx10XfQTsmvLjJWFQ=
+github.com/livekit/psrpc v0.5.0 h1:g+yYNSs6Y1/vM7UlFkB2s/ARe2y3RKWZhX8ata5j+eo=
+github.com/livekit/psrpc v0.5.0/go.mod h1:1XYH1LLoD/YbvBvt6xg2KQ/J3InLXSJK6PL/+DKmuAU=
 github.com/mackerelio/go-osstat v0.2.4 h1:qxGbdPkFo65PXOb/F/nhDKpF2nGmGaCFDLXoZjJTtUs=
 github.com/mackerelio/go-osstat v0.2.4/go.mod h1:Zy+qzGdZs3A9cuIqmgbJvwbmLQH9dJvtio5ZjJTbdlQ=
 github.com/magefile/mage v1.15.0 h1:BvGheCMAsG3bWUDbZ8AyXXpCNwU9u5CB6sM+HNb9HYg=
diff --git a/pkg/routing/roomclient.go b/pkg/routing/roomclient.go
index d511fc282..f5b6d2bf4 100644
--- a/pkg/routing/roomclient.go
+++ b/pkg/routing/roomclient.go
@@ -3,7 +3,6 @@ package routing
 import (
 	"github.com/livekit/livekit-server/pkg/config"
 	"github.com/livekit/livekit-server/pkg/telemetry/prometheus"
-	"github.com/livekit/protocol/livekit"
 	"github.com/livekit/protocol/logger"
 	protopsrpc "github.com/livekit/protocol/psrpc"
 	"github.com/livekit/protocol/rpc"
@@ -11,9 +10,8 @@ import (
 	"github.com/livekit/psrpc/pkg/middleware"
 )
 
-func NewRoomClient(nodeID livekit.NodeID, bus psrpc.MessageBus, config config.PSRPCConfig) (rpc.TypedRoomClient, error) {
+func NewRoomClient(bus psrpc.MessageBus, config config.PSRPCConfig) (rpc.TypedRoomClient, error) {
 	return rpc.NewTypedRoomClient(
-		nodeID,
 		bus,
 		protopsrpc.WithClientLogger(logger.GetLogger()),
 		middleware.WithClientMetrics(prometheus.PSRPCMetricsObserver{}),
diff --git a/pkg/service/ioservice.go b/pkg/service/ioservice.go
index a993daa83..4a653fbe5 100644
--- a/pkg/service/ioservice.go
+++ b/pkg/service/ioservice.go
@@ -52,7 +52,7 @@ func NewIOInfoService(
 	}
 
 	if bus != nil {
-		ioServer, err := rpc.NewIOInfoServer(string(nodeID), s, bus)
+		ioServer, err := rpc.NewIOInfoServer(s, bus)
 		if err != nil {
 			return nil, err
 		}
diff --git a/pkg/service/roommanager.go b/pkg/service/roommanager.go
index 14caa049e..f37bfeee8 100644
--- a/pkg/service/roommanager.go
+++ b/pkg/service/roommanager.go
@@ -119,7 +119,7 @@ func NewLocalRoomManager(
 		},
 	}
 
-	r.roomServer, err = rpc.NewTypedRoomServer(livekit.NodeID(r.currentNode.Id), r, bus)
+	r.roomServer, err = rpc.NewTypedRoomServer(r, bus)
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/service/wire_gen.go b/pkg/service/wire_gen.go
index 69412c1fe..cbc3d041a 100644
--- a/pkg/service/wire_gen.go
+++ b/pkg/service/wire_gen.go
@@ -53,7 +53,7 @@ func InitializeServer(conf *config.Config, currentNode routing.LocalNode) (*Live
 	if err != nil {
 		return nil, err
 	}
-	egressClient, err := rpc.NewEgressClient(nodeID, messageBus)
+	egressClient, err := rpc.NewEgressClient(messageBus)
 	if err != nil {
 		return nil, err
 	}
@@ -75,7 +75,7 @@ func InitializeServer(conf *config.Config, currentNode routing.LocalNode) (*Live
 	}
 	rtcEgressLauncher := NewEgressLauncher(egressClient, ioInfoService)
 	topicFormatter := routing.NewTopicFormatter()
-	roomClient, err := routing.NewRoomClient(nodeID, messageBus, psrpcConfig)
+	roomClient, err := routing.NewRoomClient(messageBus, psrpcConfig)
 	if err != nil {
 		return nil, err
 	}
@@ -85,7 +85,7 @@ func InitializeServer(conf *config.Config, currentNode routing.LocalNode) (*Live
 	}
 	egressService := NewEgressService(egressClient, objectStore, ioInfoService, roomService, rtcEgressLauncher)
 	ingressConfig := getIngressConfig(conf)
-	ingressClient, err := rpc.NewIngressClient(nodeID, messageBus)
+	ingressClient, err := rpc.NewIngressClient(messageBus)
 	if err != nil {
 		return nil, err
 	}