diff --git a/src/main/java/org/springframework/data/redis/stream/StreamPollTask.java b/src/main/java/org/springframework/data/redis/stream/StreamPollTask.java
index f1cd4abde..1e74cc59a 100644
--- a/src/main/java/org/springframework/data/redis/stream/StreamPollTask.java
+++ b/src/main/java/org/springframework/data/redis/stream/StreamPollTask.java
@@ -115,11 +115,11 @@ class StreamPollTask<K, V extends Record<K, ?>> implements Task {
 	public void run() {
 
 		pollState.starting();
-		pollState.running();
 
 		try {
 
 			isInEventLoop = true;
+			pollState.running();
 			doLoop(request.getStreamOffset().getKey());
 		} finally {
 			isInEventLoop = false;
@@ -144,8 +144,7 @@ class StreamPollTask<K, V extends Record<K, ?>> implements Task {
 				}
 			} catch (InterruptedException e) {
 
-				pollState.cancel();
-
+				cancel();
 				Thread.currentThread().interrupt();
 			} catch (RuntimeException e) {
 
diff --git a/src/test/java/org/springframework/data/redis/stream/StreamMessageListenerContainerIntegrationTests.java b/src/test/java/org/springframework/data/redis/stream/StreamMessageListenerContainerIntegrationTests.java
index 6155c5c2c..400024d86 100644
--- a/src/test/java/org/springframework/data/redis/stream/StreamMessageListenerContainerIntegrationTests.java
+++ b/src/test/java/org/springframework/data/redis/stream/StreamMessageListenerContainerIntegrationTests.java
@@ -53,7 +53,7 @@ import org.springframework.data.redis.stream.StreamMessageListenerContainer.Stre
 
 /**
  * Integration tests for {@link StreamMessageListenerContainer}.
- * 
+ *
  * @author Mark Paluch
  */
 public class StreamMessageListenerContainerIntegrationTests {