diff --git a/CHANGELOG.md b/CHANGELOG.md
index 215ddefd5..9dcc53afa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ Also check this project's [releases](https://github.com/powerhome/redis-operator
 
 ### Fixed
 - [Cleanup Sentinels when bootstrapping and sentinels are not allowed](https://github.com/powerhome/redis-operator/pull/33).
+- [Prevent connection throttling for more than 256 concurrent client connections](https://github.com/powerhome/redis-operator/pull/36)
 
 ### Added
 - [Bootstrap settings - Add an `enabled` parameter to toggle the bootstrap mode on or off for a RedisFailover. (Defaults to `true`)](https://github.com/powerhome/redis-operator/pull/32).
diff --git a/operator/redisfailover/service/generator.go b/operator/redisfailover/service/generator.go
index 319e9b856..2c11603be 100644
--- a/operator/redisfailover/service/generator.go
+++ b/operator/redisfailover/service/generator.go
@@ -169,7 +169,7 @@ func generateHAProxyConfigmap(rf *redisfailoverv1.RedisFailover, labels map[stri
 	port := rf.Spec.Redis.Port
 	haproxyCfg := fmt.Sprintf(`global
 	daemon
-	maxconn 256
+	maxconn 5000
 
 	defaults
 	mode tcp