diff --git a/webclient/components/matrix/event-stream-service.js b/webclient/components/matrix/event-stream-service.js
index 9f678e845..c94cf0fe7 100644
--- a/webclient/components/matrix/event-stream-service.js
+++ b/webclient/components/matrix/event-stream-service.js
@@ -26,7 +26,7 @@ angular.module('eventStreamService', [])
 .factory('eventStreamService', ['$q', '$timeout', 'matrixService', 'eventHandlerService', function($q, $timeout, matrixService, eventHandlerService) {
     var END = "END";
     var START = "START";
-    var TIMEOUT_MS = 5000;
+    var TIMEOUT_MS = 30000;
     var ERR_TIMEOUT_MS = 5000;
     
     var settings = {