From 8ff1960878173c2a98e8156841b3a7635fd43627 Mon Sep 17 00:00:00 2001
From: Lukas Tautz <104827162+lukastautz@users.noreply.github.com>
Date: Wed, 7 Jan 2026 19:32:16 +0100
Subject: [PATCH] Fix: use correct parameter when calling
 get_local_current_membership_for_user_in_room (#19353)

Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
---
 changelog.d/19353.bugfix    | 1 +
 synapse/handlers/message.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/19353.bugfix

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