diff --git a/synapse/notifier.py b/synapse/notifier.py
index 5475ee36c..d6655f3f5 100644
--- a/synapse/notifier.py
+++ b/synapse/notifier.py
@@ -305,8 +305,9 @@ class Notifier(object):
 
         result = None
         if timeout:
-            listener = None  # Will be set to a _NotificationListener that
-                             # we'll be waiting on. Allows us to cancel it.
+            # Will be set to a _NotificationListener that we'll be waiting on.
+            # Allows us to cancel it.
+            listener = None
 
             def timed_out():
                 if listener: