diff --git a/roomserver/internal/input/input_events.go b/roomserver/internal/input/input_events.go
index dbac8170d..88d1406ce 100644
--- a/roomserver/internal/input/input_events.go
+++ b/roomserver/internal/input/input_events.go
@@ -775,7 +775,10 @@ func (r *Inputer) kickGuests(ctx context.Context, event *gomatrixserverlib.Event
 		}
 
 		accountRes := &userAPI.QueryAccountByLocalpartResponse{}
-		if err = r.UserAPI.QueryAccountByLocalpart(ctx, &userAPI.QueryAccountByLocalpartRequest{Localpart: localpart}, accountRes); err != nil {
+		if err = r.UserAPI.QueryAccountByLocalpart(ctx, &userAPI.QueryAccountByLocalpartRequest{
+			Localpart:  localpart,
+			ServerName: senderDomain,
+		}, accountRes); err != nil {
 			return err
 		}
 		if accountRes.Account == nil {
diff --git a/userapi/api/api.go b/userapi/api/api.go
index b60622bc7..4ea2e91c3 100644
--- a/userapi/api/api.go
+++ b/userapi/api/api.go
@@ -674,7 +674,8 @@ type PerformSaveThreePIDAssociationRequest struct {
 }
 
 type QueryAccountByLocalpartRequest struct {
-	Localpart string
+	Localpart  string
+	ServerName gomatrixserverlib.ServerName
 }
 
 type QueryAccountByLocalpartResponse struct {
diff --git a/userapi/internal/api.go b/userapi/internal/api.go
index 686ce8925..0bb480da6 100644
--- a/userapi/internal/api.go
+++ b/userapi/internal/api.go
@@ -549,7 +549,7 @@ func (a *UserInternalAPI) QueryAccessToken(ctx context.Context, req *api.QueryAc
 }
 
 func (a *UserInternalAPI) QueryAccountByLocalpart(ctx context.Context, req *api.QueryAccountByLocalpartRequest, res *api.QueryAccountByLocalpartResponse) (err error) {
-	res.Account, err = a.DB.GetAccountByLocalpart(ctx, req.Localpart)
+	res.Account, err = a.DB.GetAccountByLocalpart(ctx, req.Localpart, req.ServerName)
 	return
 }