diff --git a/synapse/rest/events.py b/synapse/rest/events.py
index dc811b813..ca2f6978e 100644
--- a/synapse/rest/events.py
+++ b/synapse/rest/events.py
@@ -24,7 +24,7 @@ from synapse.rest.base import RestServlet, client_path_pattern
 class EventStreamRestServlet(RestServlet):
     PATTERN = client_path_pattern("/events$")
 
-    DEFAULT_LONGPOLL_TIME_MS = 5000
+    DEFAULT_LONGPOLL_TIME_MS = 30000
 
     @defer.inlineCallbacks
     def on_GET(self, request):