diff --git a/guacamole-common/src/main/java/net/sourceforge/guacamole/GuacamoleTCPClient.java b/guacamole-common/src/main/java/net/sourceforge/guacamole/GuacamoleTCPClient.java
index a46c5c2dc..0a1c254e7 100644
--- a/guacamole-common/src/main/java/net/sourceforge/guacamole/GuacamoleTCPClient.java
+++ b/guacamole-common/src/main/java/net/sourceforge/guacamole/GuacamoleTCPClient.java
@@ -34,7 +34,7 @@ import java.net.SocketAddress;
 
 public class GuacamoleTCPClient extends GuacamoleClient {
 
-    private static final int SOCKET_TIMEOUT = 5000;
+    private static final int SOCKET_TIMEOUT = 15000;
 
     private Socket sock;
     private Reader input;
@@ -54,6 +54,9 @@ public class GuacamoleTCPClient extends GuacamoleClient {
             sock = new Socket();
             sock.connect(address, SOCKET_TIMEOUT);
 
+            // Set read timeout
+            sock.setSoTimeout(SOCKET_TIMEOUT);
+
             // On successful connect, retrieve I/O streams
             input = new InputStreamReader(sock.getInputStream());
             output = new OutputStreamWriter(sock.getOutputStream());