diff --git a/src/socket.io/index.js b/src/socket.io/index.js
index 6c19f356a2..35e9f75f67 100644
--- a/src/socket.io/index.js
+++ b/src/socket.io/index.js
@@ -36,6 +36,7 @@ Sockets.init = function(server) {
 	io.on('connection', onConnection);
 
 	io.listen(server, {
+		pingTimeout: 30,
 		transports: ['websocket', 'polling']
 	});