diff --git a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/connection/jedis/JedisPoolWrapper.java b/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/connection/jedis/JedisPoolWrapper.java
index 95935b507..4250d37f1 100644
--- a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/connection/jedis/JedisPoolWrapper.java
+++ b/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/connection/jedis/JedisPoolWrapper.java
@@ -114,7 +114,7 @@ class JedisPoolWrapper extends Jedis {
 	}
 
 	public void disconnect() throws IOException {
-		pool.returnResource(delegate);
+		cleanup();
 	}
 
 	public String echo(String string) {
@@ -318,7 +318,7 @@ class JedisPoolWrapper extends Jedis {
 	}
 
 	public void quit() {
-		pool.returnResource(delegate);
+		cleanup();
 	}
 
 	public String randomKey() {
@@ -576,4 +576,12 @@ class JedisPoolWrapper extends Jedis {
 	public Integer zunionstore(String dstkey, ZParams params, String... sets) {
 		return delegate.zunionstore(dstkey, params, sets);
 	}
+
+	private void cleanup() {
+		try {
+			pool.returnResource(delegate);
+		} catch (Exception ex) {
+			// ignore
+		}
+	}
 }
\ No newline at end of file