diff --git a/synapse/api/auth.py b/synapse/api/auth.py
index cd0deeb0e6..c76f5180f6 100644
--- a/synapse/api/auth.py
+++ b/synapse/api/auth.py
@@ -61,6 +61,8 @@ class Auth(object):
             if event.type == RoomAliasesEvent.TYPE:
                 return True
 
+            logger.debug("Auth events: %s", auth_events)
+
             if event.type == RoomMemberEvent.TYPE:
                 allowed = self.is_membership_change_allowed(
                     event, auth_events
@@ -389,8 +391,12 @@ class Auth(object):
                 if join_rule_event:
                     auth_ids.append(join_rule_event.event_id)
 
+            if e_type == Membership.JOIN:
                 if member_event and not is_public:
                     auth_ids.append(member_event.event_id)
+            else:
+                if member_event:
+                    auth_ids.append(member_event.event_id)
         elif member_event:
             if member_event.content["membership"] == Membership.JOIN:
                 auth_ids.append(member_event.event_id)
diff --git a/tests/rest/test_events.py b/tests/rest/test_events.py
index 4a3234c332..d3159e2cf4 100644
--- a/tests/rest/test_events.py
+++ b/tests/rest/test_events.py
@@ -113,9 +113,6 @@ class EventStreamPermissionsTestCase(RestTestCase):
     def setUp(self):
         self.mock_resource = MockHttpResource(prefix=PATH_PREFIX)
 
-        persistence_service = Mock(spec=["get_latest_pdus_in_context"])
-        persistence_service.get_latest_pdus_in_context.return_value = []
-
         self.mock_config = NonCallableMock()
         self.mock_config.signing_key = [MockKey()]
 
@@ -127,7 +124,6 @@ class EventStreamPermissionsTestCase(RestTestCase):
             db_pool=db_pool,
             http_client=None,
             replication_layer=Mock(),
-            persistence_service=persistence_service,
             clock=Mock(spec=[
                 "call_later",
                 "cancel_call_later",