X-Git-Url: http://git.alex.org.uk

diff --git a/src/main/resources/tunnel.js b/src/main/resources/tunnel.js
index b81c418..a35d007 100644
--- a/src/main/resources/tunnel.js
+++ b/src/main/resources/tunnel.js
@@ -707,6 +707,12 @@ Guacamole.ChainedTunnel = function(tunnel_chain) {
      */
     function attach(tunnel) {
 
+        // Clear handlers of current tunnel, if any
+        if (current_tunnel) {
+            current_tunnel.onerror = null;
+            current_tunnel.oninstruction = null;
+        }
+
         // Set own functions to tunnel's functions
         chained_tunnel.disconnect    = tunnel.disconnect;
         chained_tunnel.sendMessage   = tunnel.sendMessage;