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 b79a1249f..45a60ca56 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
@@ -159,6 +159,9 @@ public abstract class GuacamoleHTTPTunnelServlet extends HttpServlet {
                     logger.info("Connection from {} succeeded.", request.getRemoteAddr());
 
                     try {
+                        // Ensure buggy browsers do not cache response
+                        response.setHeader("Cache-Control", "no-cache");
+                        
                         // Send UUID to client
                         response.getWriter().print(tunnel.getUUID().toString());
                     }