diff --git a/src/main/java/org/springframework/data/gemfire/server/CacheServerFactoryBean.java b/src/main/java/org/springframework/data/gemfire/server/CacheServerFactoryBean.java
index 8c0db0f7..dea15af1 100644
--- a/src/main/java/org/springframework/data/gemfire/server/CacheServerFactoryBean.java
+++ b/src/main/java/org/springframework/data/gemfire/server/CacheServerFactoryBean.java
@@ -104,7 +104,8 @@ public class CacheServerFactoryBean implements FactoryBean<CacheServer>, Initial
 		ClientSubscriptionConfig config = cacheServer.getClientSubscriptionConfig();
 		config.setCapacity(subscriptionCapacity);
 		config.setEvictionPolicy(evictionPolicy.name().toLowerCase());
-		config.setDiskStoreName(subscriptionDiskStore.getFile().getCanonicalPath());
+		if (subscriptionDiskStore != null)
+			config.setDiskStoreName(subscriptionDiskStore.getFile().getCanonicalPath());
 
 		start();
 	}