diff --git a/clientapi/clientapi.go b/clientapi/clientapi.go
index d58d799a1..957d082a6 100644
--- a/clientapi/clientapi.go
+++ b/clientapi/clientapi.go
@@ -36,7 +36,7 @@ func AddPublicRoutes(
 	rsAPI roomserverAPI.ClientRoomserverAPI,
 	asAPI appserviceAPI.AppServiceQueryAPI,
 	transactionsCache *transactions.Cache,
-	fsAPI federationAPI.FederationInternalAPI,
+	fsAPI federationAPI.ClientFederationAPI,
 	userAPI userapi.ClientUserAPI,
 	userDirectoryProvider userapi.UserDirectoryProvider,
 	keyAPI keyserverAPI.ClientKeyAPI,
diff --git a/clientapi/routing/routing.go b/clientapi/routing/routing.go
index 3b712ffa3..6da467073 100644
--- a/clientapi/routing/routing.go
+++ b/clientapi/routing/routing.go
@@ -57,7 +57,7 @@ func Setup(
 	federation *gomatrixserverlib.FederationClient,
 	syncProducer *producers.SyncAPIProducer,
 	transactionsCache *transactions.Cache,
-	federationSender federationAPI.FederationInternalAPI,
+	federationSender federationAPI.ClientFederationAPI,
 	keyAPI keyserverAPI.ClientKeyAPI,
 	extRoomsProvider api.ExtraPublicRoomsProvider,
 	mscCfg *config.MSCs, natsClient *nats.Conn,
diff --git a/federationapi/api/api.go b/federationapi/api/api.go
index 4d6b0211c..ce6a0f2ed 100644
--- a/federationapi/api/api.go
+++ b/federationapi/api/api.go
@@ -42,6 +42,7 @@ func (e *FederationClientError) Error() string {
 type FederationInternalAPI interface {
 	FederationClient
 	gomatrixserverlib.KeyDatabase
+	ClientFederationAPI
 
 	KeyRing() *gomatrixserverlib.KeyRing
 
@@ -100,6 +101,10 @@ type FederationInternalAPI interface {
 	) error
 }
 
+type ClientFederationAPI interface {
+	QueryJoinedHostServerNamesInRoom(ctx context.Context, request *QueryJoinedHostServerNamesInRoomRequest, response *QueryJoinedHostServerNamesInRoomResponse) error
+}
+
 type QueryServerKeysRequest struct {
 	ServerName      gomatrixserverlib.ServerName
 	KeyIDToCriteria map[gomatrixserverlib.KeyID]gomatrixserverlib.PublicKeyNotaryQueryCriteria
diff --git a/mediaapi/mediaapi.go b/mediaapi/mediaapi.go
index 5976957ca..4792c996d 100644
--- a/mediaapi/mediaapi.go
+++ b/mediaapi/mediaapi.go
@@ -26,7 +26,7 @@ import (
 // AddPublicRoutes sets up and registers HTTP handlers for the MediaAPI component.
 func AddPublicRoutes(
 	base *base.BaseDendrite,
-	userAPI userapi.UserInternalAPI,
+	userAPI userapi.MediaUserAPI,
 	client *gomatrixserverlib.Client,
 ) {
 	cfg := &base.Cfg.MediaAPI
diff --git a/mediaapi/routing/routing.go b/mediaapi/routing/routing.go
index 97dfd3341..76f07415b 100644
--- a/mediaapi/routing/routing.go
+++ b/mediaapi/routing/routing.go
@@ -48,7 +48,7 @@ func Setup(
 	cfg *config.MediaAPI,
 	rateLimit *config.RateLimiting,
 	db storage.Database,
-	userAPI userapi.UserInternalAPI,
+	userAPI userapi.MediaUserAPI,
 	client *gomatrixserverlib.Client,
 ) {
 	rateLimits := httputil.NewRateLimits(rateLimit)
diff --git a/userapi/api/api.go b/userapi/api/api.go
index d176f27dc..928b91e6d 100644
--- a/userapi/api/api.go
+++ b/userapi/api/api.go
@@ -32,6 +32,7 @@ type UserInternalAPI interface {
 	AppserviceUserAPI
 	SyncUserAPI
 	ClientUserAPI
+	MediaUserAPI
 
 	QueryOpenIDToken(ctx context.Context, req *QueryOpenIDTokenRequest, res *QueryOpenIDTokenResponse) error
 }
@@ -49,6 +50,10 @@ type AppserviceUserAPI interface {
 	PerformDeviceCreation(ctx context.Context, req *PerformDeviceCreationRequest, res *PerformDeviceCreationResponse) error
 }
 
+type MediaUserAPI interface {
+	QueryAcccessTokenAPI
+}
+
 type SyncUserAPI interface {
 	QueryAcccessTokenAPI
 	QueryAccountData(ctx context.Context, req *QueryAccountDataRequest, res *QueryAccountDataResponse) error