diff --git a/changelog.d/19353.bugfix b/changelog.d/19353.bugfix
new file mode 100644
index 0000000000..5dc006312c
--- /dev/null
+++ b/changelog.d/19353.bugfix
@@ -0,0 +1 @@
+Fix a bug introduced in 1.61.0 where a user's membership in a room was accidentally ignored when considering access to historical state events in rooms with the "shared" history visibility. Contributed by Lukas Tautz.
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py
index 7808bd68cb..99ce120736 100644
--- a/synapse/handlers/message.py
+++ b/synapse/handlers/message.py
@@ -322,7 +322,7 @@ class MessageHandler:
             current_membership,
             _,
         ) = await self.store.get_local_current_membership_for_user_in_room(
-            user_id, event_id
+            user_id, room_id
         )
         return current_membership == Membership.JOIN