diff --git a/History.md b/History.md
index 84fd300d1a..38d13f0f48 100644
--- a/History.md
+++ b/History.md
@@ -104,6 +104,9 @@
 
 * Better error when passing a string to `{{#each}}`. #722
 
+* Add support for JSESSIONID cookies for sticky sessions. Set the
+  `USE_JSESSIONID` environment variable to enable.
+
 * Upgraded dependencies:
   * Node from 0.8.24 to 0.10.19
   * MongoDB from 2.4.4 to 2.4.6
diff --git a/packages/livedata/stream_server.js b/packages/livedata/stream_server.js
index e00a42ada9..a0f10ecb0f 100644
--- a/packages/livedata/stream_server.js
+++ b/packages/livedata/stream_server.js
@@ -38,7 +38,10 @@ StreamServer = function () {
     // combining CPU-heavy processing with SockJS termination (eg a proxy which
     // converts to Unix sockets) but for now, raise the delay.
     disconnect_delay: 60 * 1000,
-    jsessionid: false
+    // Set the USE_JSESSIONID environment variable to enable setting the
+    // JSESSIONID cookie. This is useful for setting up proxies with
+    // session affinity.
+    jsessionid: !!process.env.USE_JSESSIONID
   };
 
   // If you know your server environment (eg, proxies) will prevent websockets