1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index a1d542854d..d317f2b30e 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -343,9 +343,9 @@ class RoomMemberHandler(BaseHandler):
         """
         target_user_id = event.state_key
 
-        # TODO(markjh): get prev state from snapshot.
-        prev_state = yield self.store.get_room_member(
-            target_user_id, event.room_id
+        prev_state = context.current_state.get(
+            (RoomMemberEvent.TYPE, target_user_id),
+            None
         )
 
         room_id = event.room_id