diff --git a/CHANGES.txt b/CHANGES.txt
index e2375748..cd2a831d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,8 +1,9 @@
 5.8.0 (May XX, 2024)
  - Added support for targeting rules based on semantic versions (https://semver.org/).
  - Added special impression label "targeting rule type unsupported by sdk" when the matcher type is not supported by the SDK, which returns 'control' treatment.
+ - Forward TLS server name when in redis-sentinel & redis-cluster
 
-5.7.0 (TD)
+5.7.0 (TBD)
  - Add support for FIPS-compliant binaries & docker images
 
 5.6.1 (Jan 29, 2024)
diff --git a/splitio/producer/util.go b/splitio/producer/util.go
index d5e5d9cb..be129d58 100644
--- a/splitio/producer/util.go
+++ b/splitio/producer/util.go
@@ -36,13 +36,9 @@ func parseTLSConfig(opt *conf.Redis) (*tls.Config, error) {
 		return nil, nil
 	}
 
-	cfg := tls.Config{}
-	if !opt.SentinelReplication && !opt.ClusterMode {
-		if opt.TLSServerName != "" {
-			cfg.ServerName = opt.TLSServerName
-		} else {
-			cfg.ServerName = opt.Host
-		}
+	cfg := tls.Config{ServerName: opt.TLSServerName}
+	if cfg.ServerName == "" {
+		cfg.ServerName = opt.Host
 	}
 
 	if len(opt.TLSCACertificates) > 0 {