diff --git a/guacamole-common/src/main/java/net/sourceforge/guacamole/servlet/GuacamoleHTTPTunnelServlet.java b/guacamole-common/src/main/java/net/sourceforge/guacamole/servlet/GuacamoleHTTPTunnelServlet.java
index 464b3fc60..ed71e51d4 100644
--- a/guacamole-common/src/main/java/net/sourceforge/guacamole/servlet/GuacamoleHTTPTunnelServlet.java
+++ b/guacamole-common/src/main/java/net/sourceforge/guacamole/servlet/GuacamoleHTTPTunnelServlet.java
@@ -96,6 +96,13 @@ public abstract class GuacamoleHTTPTunnelServlet extends HttpServlet {
                 GuacamoleTunnel tunnel = doConnect(request);
                 if (tunnel != null) {
 
+                    // Get session
+                    HttpSession httpSession = request.getSession(true);
+                    GuacamoleSession session = new GuacamoleSession(httpSession);
+
+                    // Attach tunnel to session
+                    session.attachTunnel(tunnel);
+
                     logger.info("Connection from {} succeeded.", request.getRemoteAddr());
                 
                     try {