diff --git a/synapse/handlers/events.py b/synapse/handlers/events.py
index 980a169b2..3e9efabd2 100644
--- a/synapse/handlers/events.py
+++ b/synapse/handlers/events.py
@@ -126,5 +126,7 @@ class EventHandler(BaseHandler):
             defer.returnValue(None)
             return
 
-        yield self.auth.check(event, raises=True)
+        if hasattr(event, "room_id"):
+            yield self.auth.check_joined_room(event.room_id, user.to_string())
+
         defer.returnValue(event)