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 45a60ca56..7b976928b 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
@@ -277,6 +277,7 @@ public abstract class GuacamoleHTTPTunnelServlet extends HttpServlet {
             // buffer 1024 bytes before starting a normal stream if we use
             // anything but application/octet-stream.
             response.setContentType("application/octet-stream");
+            response.setHeader("Cache-Control", "no-cache");
 
             Writer out = new BufferedWriter(new OutputStreamWriter(response.getOutputStream(), "UTF-8"));
 
@@ -368,6 +369,7 @@ public abstract class GuacamoleHTTPTunnelServlet extends HttpServlet {
         // attempt to parse the result, even though the JavaScript client
         // does not explicitly request such parsing.
         response.setContentType("application/octet-stream");
+        response.setHeader("Cache-Control", "no-cache");
         response.setContentLength(0);
 
         // Send data