diff --git a/guacamole-common-js/src/main/webapp/modules/Tunnel.js b/guacamole-common-js/src/main/webapp/modules/Tunnel.js
index b990ed121..91b13713a 100644
--- a/guacamole-common-js/src/main/webapp/modules/Tunnel.js
+++ b/guacamole-common-js/src/main/webapp/modules/Tunnel.js
@@ -842,6 +842,15 @@ Guacamole.ChainedTunnel = function(tunnel_chain) {
      */
     var tunnels = [];
 
+    /**
+     * The tunnel committed via commit_tunnel(), if any, or null if no tunnel
+     * has yet been committed.
+     *
+     * @private
+     * @type Guacamole.Tunnel
+     */
+    var committedTunnel = null;
+
     // Load all tunnels into array
     for (var i=0; i<arguments.length; i++)
         tunnels.push(arguments[i]);
@@ -893,6 +902,7 @@ Guacamole.ChainedTunnel = function(tunnel_chain) {
             tunnel.onstatechange = chained_tunnel.onstatechange;
             tunnel.oninstruction = chained_tunnel.oninstruction;
             tunnel.onerror = chained_tunnel.onerror;
+            committedTunnel = tunnel;
         }
 
         // Wrap own onstatechange within current tunnel
@@ -948,8 +958,8 @@ Guacamole.ChainedTunnel = function(tunnel_chain) {
         // Remember connect data
         connect_data = data;
 
-        // Get first tunnel
-        var next_tunnel = tunnels.shift();
+        // Get committed tunnel if exists or the first tunnel on the list
+        var next_tunnel = committedTunnel ? committedTunnel : tunnels.shift();
 
         // Attach first tunnel
         if (next_tunnel)