diff --git a/src/main/java/org/springframework/data/redis/connection/jedis/JedisConnection.java b/src/main/java/org/springframework/data/redis/connection/jedis/JedisConnection.java
index dc6904b4b..d0cd721ef 100644
--- a/src/main/java/org/springframework/data/redis/connection/jedis/JedisConnection.java
+++ b/src/main/java/org/springframework/data/redis/connection/jedis/JedisConnection.java
@@ -584,6 +584,10 @@ public class JedisConnection implements RedisConnection {
 
 	public void discard() {
 		try {
+			if (isPipelined()) {
+				pipeline.discard();
+				return;
+			}
 			client.discard();
 		} catch (Exception ex) {
 			throw convertJedisAccessException(ex);