diff --git a/shared/src/main/java/net/leaderos/shared/modules/connect/socket/SocketClient.java b/shared/src/main/java/net/leaderos/shared/modules/connect/socket/SocketClient.java
index 512a5bee7..ab9925dfa 100644
--- a/shared/src/main/java/net/leaderos/shared/modules/connect/socket/SocketClient.java
+++ b/shared/src/main/java/net/leaderos/shared/modules/connect/socket/SocketClient.java
@@ -49,7 +49,10 @@ public SocketClient(String apiKey, String serverToken) {
         options.setWsPort(6001);
         options.setWssPort(6002);
         options.setChannelAuthorizer(authorizer);
-        options.setActivityTimeout(30000);
+        options.setActivityTimeout(10000);
+        options.setPongTimeout(5000);
+        options.setMaxReconnectionAttempts(100);
+        options.setMaxReconnectGapInSeconds(5);
 
         // Create pusher instance
         this.pusher = new Pusher(appKey, options);