diff --git a/build/gobind/monolith.go b/build/gobind/monolith.go
index 30fdc6181..750babad8 100644
--- a/build/gobind/monolith.go
+++ b/build/gobind/monolith.go
@@ -79,7 +79,7 @@ func (m *DendriteMonolith) Start() {
 
 	accountDB := base.CreateAccountsDB()
 	deviceDB := base.CreateDeviceDB()
-	federation := base.CreateFederationClient()
+	federation := ygg.CreateFederationClient(base)
 
 	serverKeyAPI := &signing.YggdrasilKeys{}
 	keyRing := serverKeyAPI.KeyRing()
@@ -112,7 +112,7 @@ func (m *DendriteMonolith) Start() {
 		Config:        base.Cfg,
 		AccountDB:     accountDB,
 		DeviceDB:      deviceDB,
-		Client:        gomatrixserverlib.NewClient(),
+		Client:        ygg.CreateClient(base),
 		FedClient:     federation,
 		KeyRing:       keyRing,
 		KafkaConsumer: base.KafkaConsumer,
diff --git a/clientapi/routing/joinroom.go b/clientapi/routing/joinroom.go
index 3871e4d4e..db890d03f 100644
--- a/clientapi/routing/joinroom.go
+++ b/clientapi/routing/joinroom.go
@@ -37,6 +37,7 @@ func JoinRoomByIDOrAlias(
 	joinReq := roomserverAPI.PerformJoinRequest{
 		RoomIDOrAlias: roomIDOrAlias,
 		UserID:        device.UserID,
+		Content:       map[string]interface{}{},
 	}
 	joinRes := roomserverAPI.PerformJoinResponse{}