diff --git a/synapse/streams/events.py b/synapse/streams/events.py
index eaa397c65..c68cf1a59 100644
--- a/synapse/streams/events.py
+++ b/synapse/streams/events.py
@@ -15,7 +15,6 @@
 
 from twisted.internet import defer
 
-from synapse.api.constants import Membership
 from synapse.types import StreamToken
 
 
@@ -32,7 +31,7 @@ class NullSource(object):
         return defer.succeed(0)
 
     def get_pagination_rows(self, user, pagination_config, key):
-        return defer.succeed(([], from_token))
+        return defer.succeed(([], pagination_config.from_token))
 
 
 class RoomEventSource(object):