Merge branch 'develop' of github.com:matrix-org/synapse into erikj/push_actions_delete

1 files changed, 1 insertions, 1 deletions

diff --git a/synapse/handlers/presence.py b/synapse/handlers/presence.py

index d0c8f1328b..639567953a 100644
--- a/synapse/handlers/presence.py
+++ b/synapse/handlers/presence.py
@@ -168,7 +168,7 @@ class PresenceHandler(BaseHandler):
         # The initial delay is to allow disconnected clients a chance to
         # reconnect before we treat them as offline.
         self.clock.call_later(
-            0 * 1000,
+            30 * 1000,
             self.clock.looping_call,
             self._handle_timeouts,
             5000,