diff --git a/guacamole/src/main/webapp/client.xhtml b/guacamole/src/main/webapp/client.xhtml
index ba9a5a43c..27caec548 100644
--- a/guacamole/src/main/webapp/client.xhtml
+++ b/guacamole/src/main/webapp/client.xhtml
@@ -105,7 +105,10 @@
 
                     // If WebSocket available, try to use it.
                     if (window.WebSocket)
-                        tunnel = new Guacamole.WebSocketTunnel("websocket-tunnel")
+                        tunnel = new Guacamole.ChainedTunnel(
+                            new Guacamole.WebSocketTunnel("websocket-tunnel"),
+                            new Guacamole.HTTPTunnel("tunnel")
+                        );
 
                     // If no WebSocket, then use HTTP.
                     else