diff --git a/synapse/notifier.py b/synapse/notifier.py
index abe12b143..ef7d15671 100644
--- a/synapse/notifier.py
+++ b/synapse/notifier.py
@@ -311,7 +311,7 @@ class Notifier(object):
                     user, getattr(from_token, keyname), limit,
                 )
                 events.extend(stuff)
-                end_token = from_token.copy_and_replace(keyname, new_key)
+                end_token = end_token.copy_and_replace(keyname, new_key)
 
             if events:
                 defer.returnValue((events, (from_token, end_token)))