diff --git a/cmd/dendrite-demo-libp2p/main.go b/cmd/dendrite-demo-libp2p/main.go
index f1d18d0e0..66d103eaf 100644
--- a/cmd/dendrite-demo-libp2p/main.go
+++ b/cmd/dendrite-demo-libp2p/main.go
@@ -148,7 +148,7 @@ func main() {
 	federation := createFederationClient(base)
 	keyRing := keydb.CreateKeyRing(federation.Client, keyDB, cfg.Matrix.KeyPerspectives)
 
-	alias, input, query := roomserver.SetupRoomServerComponent(&base.Base, keyRing)
+	alias, input, query := roomserver.SetupRoomServerComponent(&base.Base, keyRing, federation)
 	eduInputAPI := eduserver.SetupEDUServerComponent(&base.Base, cache.New())
 	asQuery := appservice.SetupAppServiceAPIComponent(
 		&base.Base, accountDB, deviceDB, federation, alias, query, transactions.New(),
diff --git a/cmd/dendrite-monolith-server/main.go b/cmd/dendrite-monolith-server/main.go
index 8cfb75665..f3e720a88 100644
--- a/cmd/dendrite-monolith-server/main.go
+++ b/cmd/dendrite-monolith-server/main.go
@@ -57,7 +57,7 @@ func main() {
 	federation := base.CreateFederationClient()
 	keyRing := keydb.CreateKeyRing(federation.Client, keyDB, cfg.Matrix.KeyPerspectives)
 
-	alias, input, query := roomserver.SetupRoomServerComponent(base, keyRing)
+	alias, input, query := roomserver.SetupRoomServerComponent(base, keyRing, federation)
 	eduInputAPI := eduserver.SetupEDUServerComponent(base, cache.New())
 	asQuery := appservice.SetupAppServiceAPIComponent(
 		base, accountDB, deviceDB, federation, alias, query, transactions.New(),
diff --git a/cmd/dendrite-room-server/main.go b/cmd/dendrite-room-server/main.go
index f33a2b88f..98410452f 100644
--- a/cmd/dendrite-room-server/main.go
+++ b/cmd/dendrite-room-server/main.go
@@ -30,7 +30,7 @@ func main() {
 	federation := base.CreateFederationClient()
 	keyRing := keydb.CreateKeyRing(federation.Client, keyDB, cfg.Matrix.KeyPerspectives)
 
-	roomserver.SetupRoomServerComponent(base, keyRing)
+	roomserver.SetupRoomServerComponent(base, keyRing, federation)
 
 	base.SetupAndServeHTTP(string(base.Cfg.Bind.RoomServer), string(base.Cfg.Listen.RoomServer))
 
diff --git a/cmd/dendritejs/main.go b/cmd/dendritejs/main.go
index 23d4327d7..6300d249f 100644
--- a/cmd/dendritejs/main.go
+++ b/cmd/dendritejs/main.go
@@ -123,7 +123,7 @@ func main() {
 	}
 	p2pPublicRoomProvider := NewLibP2PPublicRoomsProvider(node)
 
-	alias, input, query := roomserver.SetupRoomServerComponent(base, keyRing)
+	alias, input, query := roomserver.SetupRoomServerComponent(base, keyRing, federation)
 	eduInputAPI := eduserver.SetupEDUServerComponent(base, cache.New())
 	asQuery := appservice.SetupAppServiceAPIComponent(
 		base, accountDB, deviceDB, federation, alias, query, transactions.New(),
diff --git a/roomserver/roomserver.go b/roomserver/roomserver.go
index ea1c5c4c3..f6a373a4f 100644
--- a/roomserver/roomserver.go
+++ b/roomserver/roomserver.go
@@ -35,6 +35,7 @@ import (
 // APIs directly instead of having to use HTTP.
 func SetupRoomServerComponent(
 	base *basecomponent.BaseDendrite, keyRing gomatrixserverlib.JSONVerifier,
+	fedClient *gomatrixserverlib.FederationClient,
 ) (api.RoomserverAliasAPI, api.RoomserverInputAPI, api.RoomserverQueryAPI) {
 	roomserverDB, err := storage.Open(string(base.Cfg.Database.RoomServer))
 	if err != nil {
@@ -53,7 +54,7 @@ func SetupRoomServerComponent(
 		DB:             roomserverDB,
 		ImmutableCache: base.ImmutableCache,
 		ServerName:     base.Cfg.Matrix.ServerName,
-		FedClient:      base.CreateFederationClient(),
+		FedClient:      fedClient,
 		// TODO: We should have a key server so we don't keep adding components
 		// which talk to the same DB.
 		KeyRing: keyRing,