diff --git a/docs/src/docs/asciidoc/guides/httpsession-gemfire-boot.adoc b/docs/src/docs/asciidoc/guides/httpsession-gemfire-boot.adoc
index bee1d6f7..73a98ef4 100644
--- a/docs/src/docs/asciidoc/guides/httpsession-gemfire-boot.adoc
+++ b/docs/src/docs/asciidoc/guides/httpsession-gemfire-boot.adoc
@@ -232,6 +232,9 @@ or https://getfirebug.com/wiki/index.php/Cookies_Panel#Cookies_List[Firefox]).
 NOTE: The following instructions assume you have a local GemFire installation.  For more information on installation,
 see http://gemfire.docs.pivotal.io/docs-gemfire/latest/getting_started/installation/install_intro.html[Installing Pivotal GemFire].
 
+NOTE: In order to run the following, you must uncomment the lines in the `GemFireServer` class, `gemfireProperties` bean
+for the following GemFire System properties: `jmx-manager` and `jmx-manager-start`.
+
 If you like, you can easily remove the session using `gfsh`. For example, on a Linux-based system type the following
 at the command-line:
 
diff --git a/samples/httpsession-gemfire-boot/src/main/java/sample/client/Application.java b/samples/httpsession-gemfire-boot/src/main/java/sample/client/Application.java
index 5405b209..57e382fa 100644
--- a/samples/httpsession-gemfire-boot/src/main/java/sample/client/Application.java
+++ b/samples/httpsession-gemfire-boot/src/main/java/sample/client/Application.java
@@ -72,7 +72,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 @Controller
 public class Application {
 
-	static final long DEFAULT_WAIT_DURATION = TimeUnit.SECONDS.toMillis(20);
+	static final long DEFAULT_WAIT_DURATION = TimeUnit.SECONDS.toMillis(60);
 
 	static final CountDownLatch latch = new CountDownLatch(1);
 
@@ -127,7 +127,7 @@ public class Application {
 
 		gemfirePool.setKeepAlive(false);
 		gemfirePool.setPingInterval(TimeUnit.SECONDS.toMillis(5));
-		gemfirePool.setReadTimeout(Long.valueOf(TimeUnit.SECONDS.toMillis(2)).intValue());
+		gemfirePool.setReadTimeout(Long.valueOf(TimeUnit.SECONDS.toMillis(15)).intValue());
 		gemfirePool.setRetryAttempts(1);
 		gemfirePool.setSubscriptionEnabled(true);
 		gemfirePool.setThreadLocalConnections(false);
diff --git a/samples/httpsession-gemfire-boot/src/main/java/sample/server/GemFireServer.java b/samples/httpsession-gemfire-boot/src/main/java/sample/server/GemFireServer.java
index 53cda3b0..d536f8a7 100644
--- a/samples/httpsession-gemfire-boot/src/main/java/sample/server/GemFireServer.java
+++ b/samples/httpsession-gemfire-boot/src/main/java/sample/server/GemFireServer.java
@@ -66,15 +66,14 @@ public class GemFireServer {
 		gemfireProperties.setProperty("name", applicationName());
 		gemfireProperties.setProperty("mcast-port", "0");
 		gemfireProperties.setProperty("log-level", logLevel());
-		gemfireProperties.setProperty("jmx-manager", "true");
-		gemfireProperties.setProperty("jmx-manager-start", "true");
+		//gemfireProperties.setProperty("jmx-manager", "true");
+		//gemfireProperties.setProperty("jmx-manager-start", "true");
 
 		return gemfireProperties;
 	}
 
 	String applicationName() {
-		return "samples:httpsession-gemfire-boot:"
-			.concat(getClass().getSimpleName());
+		return "samples:httpsession-gemfire-boot:".concat(getClass().getSimpleName());
 	}
 
 	String logLevel() {