diff --git a/clientapi/routing/state.go b/clientapi/routing/state.go
index 088e412c6..d25ee8237 100644
--- a/clientapi/routing/state.go
+++ b/clientapi/routing/state.go
@@ -235,7 +235,7 @@ func OnIncomingStateTypeRequest(
 		}
 		// If the user has never been in the room then stop at this point.
 		// We won't tell the user about a room they have never joined.
-		if !membershipRes.HasBeenInRoom {
+		if !membershipRes.HasBeenInRoom || membershipRes.Membership == gomatrixserverlib.Ban {
 			return util.JSONResponse{
 				Code: http.StatusForbidden,
 				JSON: jsonerror.Forbidden(fmt.Sprintf("Unknown room %q or user %q has never joined this room", roomID, device.UserID)),
diff --git a/sytest-whitelist b/sytest-whitelist
index cd4d79a7f..d3144572d 100644
--- a/sytest-whitelist
+++ b/sytest-whitelist
@@ -600,3 +600,4 @@ Device list doesn't change if remote server is down
 Can query remote device keys using POST after notification
 Device deletion propagates over federation
 Get left notifs in sync and /keys/changes when other user leaves
+Remote banned user is kicked and may not rejoin until unbanned