diff --git a/roomserver/api/api.go b/roomserver/api/api.go
index 0d60d77c9..c266e176b 100644
--- a/roomserver/api/api.go
+++ b/roomserver/api/api.go
@@ -22,7 +22,7 @@ type RoomserverInternalAPI interface {
 	// interdependencies between the roomserver and other input APIs
 	SetFederationAPI(fsAPI fsAPI.RoomserverFederationAPI, keyRing *gomatrixserverlib.KeyRing)
 	SetAppserviceAPI(asAPI asAPI.AppServiceQueryAPI)
-	SetUserAPI(userAPI userapi.UserInternalAPI)
+	SetUserAPI(userAPI userapi.RoomserverUserAPI)
 
 	// QueryAuthChain returns the entire auth chain for the event IDs given.
 	// The response includes the events in the request.
diff --git a/roomserver/api/api_trace.go b/roomserver/api/api_trace.go
index 361dc86d3..f6fdbaab2 100644
--- a/roomserver/api/api_trace.go
+++ b/roomserver/api/api_trace.go
@@ -27,7 +27,7 @@ func (t *RoomserverInternalAPITrace) SetAppserviceAPI(asAPI asAPI.AppServiceQuer
 	t.Impl.SetAppserviceAPI(asAPI)
 }
 
-func (t *RoomserverInternalAPITrace) SetUserAPI(userAPI userapi.UserInternalAPI) {
+func (t *RoomserverInternalAPITrace) SetUserAPI(userAPI userapi.RoomserverUserAPI) {
 	t.Impl.SetUserAPI(userAPI)
 }
 
diff --git a/roomserver/internal/api.go b/roomserver/internal/api.go
index dc0a0a718..c774c75a9 100644
--- a/roomserver/internal/api.go
+++ b/roomserver/internal/api.go
@@ -177,7 +177,7 @@ func (r *RoomserverInternalAPI) SetFederationAPI(fsAPI fsAPI.RoomserverFederatio
 	}
 }
 
-func (r *RoomserverInternalAPI) SetUserAPI(userAPI userapi.UserInternalAPI) {
+func (r *RoomserverInternalAPI) SetUserAPI(userAPI userapi.RoomserverUserAPI) {
 	r.Leaver.UserAPI = userAPI
 }
 
diff --git a/roomserver/internal/perform/perform_leave.go b/roomserver/internal/perform/perform_leave.go
index b006843fb..c5b62ac00 100644
--- a/roomserver/internal/perform/perform_leave.go
+++ b/roomserver/internal/perform/perform_leave.go
@@ -38,7 +38,7 @@ type Leaver struct {
 	Cfg     *config.RoomServer
 	DB      storage.Database
 	FSAPI   fsAPI.RoomserverFederationAPI
-	UserAPI userapi.UserInternalAPI
+	UserAPI userapi.RoomserverUserAPI
 	Inputer *input.Inputer
 }
 
diff --git a/roomserver/inthttp/client.go b/roomserver/inthttp/client.go
index 659585a45..247319ca6 100644
--- a/roomserver/inthttp/client.go
+++ b/roomserver/inthttp/client.go
@@ -95,7 +95,7 @@ func (h *httpRoomserverInternalAPI) SetAppserviceAPI(asAPI asAPI.AppServiceQuery
 }
 
 // SetUserAPI no-ops in HTTP client mode as there is no chicken/egg scenario
-func (h *httpRoomserverInternalAPI) SetUserAPI(userAPI userapi.UserInternalAPI) {
+func (h *httpRoomserverInternalAPI) SetUserAPI(userAPI userapi.RoomserverUserAPI) {
 }
 
 // SetRoomAlias implements RoomserverAliasAPI
diff --git a/userapi/api/api.go b/userapi/api/api.go
index dc8c12b74..8012a9144 100644
--- a/userapi/api/api.go
+++ b/userapi/api/api.go
@@ -31,6 +31,7 @@ type UserInternalAPI interface {
 	ClientUserAPI
 	MediaUserAPI
 	FederationUserAPI
+	RoomserverUserAPI
 
 	QuerySearchProfilesAPI // used by p2p demos
 }
@@ -41,6 +42,10 @@ type AppserviceUserAPI interface {
 	PerformDeviceCreation(ctx context.Context, req *PerformDeviceCreationRequest, res *PerformDeviceCreationResponse) error
 }
 
+type RoomserverUserAPI interface {
+	QueryAccountData(ctx context.Context, req *QueryAccountDataRequest, res *QueryAccountDataResponse) error
+}
+
 // api functions required by the media api
 type MediaUserAPI interface {
 	QueryAcccessTokenAPI