diff --git a/CHANGELOG.md b/CHANGELOG.md
index 15539488..730b2587 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ The **patch** part changes incrementally at each release.
 ## [Unreleased]
 
 ### Added
+* redis: set masterauth when redis_password is defined
 
 ### Changed
 
diff --git a/redis/templates/redis.conf.j2 b/redis/templates/redis.conf.j2
index d2e558cc..21873942 100644
--- a/redis/templates/redis.conf.j2
+++ b/redis/templates/redis.conf.j2
@@ -9,6 +9,7 @@ unixsocket {{ redis_unixsocket }}
 
 {% if redis_password %}
 requirepass {{ redis_password }}
+masterauth {{ redis_password }}
 {% endif %}
 
 timeout {{ redis_timeout }}