diff --git a/pkg/client/events/replay_client.go b/pkg/client/events/replay_client.go
index 112fa44c3..8224a2a89 100644
--- a/pkg/client/events/replay_client.go
+++ b/pkg/client/events/replay_client.go
@@ -21,7 +21,7 @@ const (
 	// eventsBytesRetryLimit is the maximum number of times to attempt to
 	// re-establish the events query bytes subscription when the events bytes
 	// observable returns an error or closes.
-	eventsBytesRetryLimit        = 10
+	eventsBytesRetryLimit        = 0
 	eventsBytesRetryResetTimeout = 10 * time.Second
 	// replayObsCacheBufferSize is the replay buffer size of the
 	// replayObsCache replay observable which is used to cache the replay
diff --git a/pkg/retry/retry.go b/pkg/retry/retry.go
index bd06af941..b73af9f3e 100644
--- a/pkg/retry/retry.go
+++ b/pkg/retry/retry.go
@@ -58,7 +58,7 @@ func OnError(
 				return nil
 			}
 
-			if retryCount >= retryLimit {
+			if retryLimit > 0 && retryCount >= retryLimit {
 				return err
 			}