diff --git a/changelog.d/3916.feature b/changelog.d/3916.feature
new file mode 100644
index 000000000000..13282d992b9a
--- /dev/null
+++ b/changelog.d/3916.feature
@@ -0,0 +1 @@
+Always LL ourselves if we're in a room
diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py
index 9bca4e70670d..b598916b215c 100644
--- a/synapse/handlers/sync.py
+++ b/synapse/handlers/sync.py
@@ -713,6 +713,10 @@ def compute_state_delta(self, room_id, batch, sync_config, since_token, now_toke
                     )
                 ]
 
+                # always make sure we LL ourselves so we know we're in the room
+                # (if we are), to fix https://github.com/vector-im/riot-web/issues/7209
+                types.append((EventTypes.Member, sync_config.user.to_string()))
+
                 # only apply the filtering to room members
                 filtered_types = [EventTypes.Member]