diff --git a/src/play/modules/redis/RedisCacheImpl.java b/src/play/modules/redis/RedisCacheImpl.java
index 985318c..d31bd2a 100644
--- a/src/play/modules/redis/RedisCacheImpl.java
+++ b/src/play/modules/redis/RedisCacheImpl.java
@@ -229,7 +229,9 @@ public boolean safeDelete(String key) {
 
 	@Override
 	public void stop() {
-		getCacheConnection().flushAll();
+		if (Play.configuration.getProperty("redis.cache.flushallonstop", "true").equals("true")) {
+			getCacheConnection().flushAll();
+		}
 		connectionPool.destroy();
 	}