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 e1c48175f..e4ed51ad9 100644
--- a/src/main/java/org/springframework/data/redis/stream/StreamPollTask.java
+++ b/src/main/java/org/springframework/data/redis/stream/StreamPollTask.java
@@ -148,11 +148,11 @@ class StreamPollTask<K, V extends Record<K, ?>> implements Task {
 				Thread.currentThread().interrupt();
 			} catch (RuntimeException e) {
 
-				errorHandler.handleError(e);
-
 				if (cancelSubscriptionOnError.test(e)) {
 					cancel();
 				}
+
+				errorHandler.handleError(e);
 			}
 		} while (pollState.isSubscriptionActive());
 	}