diff --git a/synapse/api/filtering.py b/synapse/api/filtering.py
index 522b151c35..765d1bc9d5 100644
--- a/synapse/api/filtering.py
+++ b/synapse/api/filtering.py
@@ -191,8 +191,8 @@ class Filter(object):
             )
         else:
             return self.check_fields(
-                event.room_id,
-                event.sender,
+                getattr(event, "room_id", None),
+                getattr(event, "sender", None),
                 event.type,
             )