diff --git a/synapse/handlers/events.py b/synapse/handlers/events.py
index 75fb94100..f1a3e4a4a 100644
--- a/synapse/handlers/events.py
+++ b/synapse/handlers/events.py
@@ -51,19 +51,21 @@ class EventStreamHandler(BaseHandler):
         auth_user = self.hs.parse_userid(auth_user_id)
 
         try:
-            if affect_presence and auth_user not in self._streams_per_user:
-                self._streams_per_user[auth_user] = 0
-                if auth_user in self._stop_timer_per_user:
-                    try:
-                        self.clock.cancel_call_later(
-                            self._stop_timer_per_user.pop(auth_user)
+            if affect_presence:
+                if auth_user not in self._streams_per_user:
+                    self._streams_per_user[auth_user] = 0
+                    if auth_user in self._stop_timer_per_user:
+                        try:
+                            print "cancel",auth_user
+                            self.clock.cancel_call_later(
+                                self._stop_timer_per_user.pop(auth_user)
+                            )
+                        except:
+                            logger.exception("Failed to cancel event timer")
+                    else:
+                        yield self.distributor.fire(
+                            "started_user_eventstream", auth_user
                         )
-                    except:
-                        logger.exception("Failed to cancel event timer")
-                else:
-                    yield self.distributor.fire(
-                        "started_user_eventstream", auth_user
-                    )
                 self._streams_per_user[auth_user] += 1
 
             if pagin_config.from_token is None: