diff --git a/charts/funkwhale/templates/_helpers.tpl b/charts/funkwhale/templates/_helpers.tpl
index 46d57eb..c3f3c9d 100644
--- a/charts/funkwhale/templates/_helpers.tpl
+++ b/charts/funkwhale/templates/_helpers.tpl
@@ -11,7 +11,7 @@ postgres://{{ .Values.database.user}}:{{ .Values.database.password }}@{{ .Values
 {{- end -}}
 
 {{- define "funkwhale.redisUrl" -}}
-redis://:{{ .Values.redis.password }}@{{ .Values.redis.host }}:{{ .Values.redis.redisPort }}/0
+redis://:{{ .Values.redis.password }}@{{ .Values.redis.host | default (printf "%s-%s" (include "funkwhale.fullname" .) "redis-master") }}:{{ .Values.redis.redisPort }}/0
 {{- end -}}
 
 {{/*
diff --git a/charts/funkwhale/values.yaml b/charts/funkwhale/values.yaml
index 45e85c4..a0f9834 100644
--- a/charts/funkwhale/values.yaml
+++ b/charts/funkwhale/values.yaml
@@ -57,7 +57,7 @@ redis:
       enabled: false
   password: funkwhale
   redisPort: 6379
-  host: {{ template "funkwhale.fullname" . }}-redis-master
+  # host: {{ template "funkwhale.fullname" . }}-redis-master
 
 djangoSecret: ''