diff --git a/synapse/api/filtering.py b/synapse/api/filtering.py
index 19f30c273cff..bc03d6c2872b 100644
--- a/synapse/api/filtering.py
+++ b/synapse/api/filtering.py
@@ -143,6 +143,10 @@ def __init__(self, filter_json):
             self.filter_json.get("account_data", {})
         )
 
+        self.include_leave = self.filter_json.get("room", {}).get(
+            "include_leave", False
+        )
+
     def timeline_limit(self):
         return self.room_timeline_filter.limit()
 
diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py
index 943ce368ef43..24c2b2fad68b 100644
--- a/synapse/handlers/sync.py
+++ b/synapse/handlers/sync.py
@@ -186,14 +186,14 @@ def full_state_sync(self, sync_config, timeline_since_token):
             pagination_config=pagination_config.get_source_config("presence"),
             key=None
         )
+
+        membership_list = (Membership.INVITE, Membership.JOIN)
+        if sync_config.filter.include_leave:
+            membership_list += (Membership.LEAVE, Membership.BAN)
+
         room_list = yield self.store.get_rooms_for_user_where_membership_is(
             user_id=sync_config.user.to_string(),
-            membership_list=(
-                Membership.INVITE,
-                Membership.JOIN,
-                Membership.LEAVE,
-                Membership.BAN
-            )
+            membership_list=membership_list
         )
 
         account_data, account_data_by_room = (