diff --git a/synapse/notifier.py b/synapse/notifier.py
index 0fa77d28c..e6f37c373 100644
--- a/synapse/notifier.py
+++ b/synapse/notifier.py
@@ -404,6 +404,7 @@ class Notifier(object):
         def _timeout_listener():
             # TODO (erikj): We should probably set to_token to the current
             # max rather than reusing from_token.
+            listener.timer = None
             listener.notify(
                 self,
                 [],