diff --git a/charts/funkwhale/templates/_helpers.tpl b/charts/funkwhale/templates/_helpers.tpl
index 46d57eb..200ebd8 100644
--- a/charts/funkwhale/templates/_helpers.tpl
+++ b/charts/funkwhale/templates/_helpers.tpl
@@ -7,11 +7,7 @@ Expand the name of the chart.
 {{- end -}}
 
 {{- define "funkwhale.dbUrl" -}}
-postgres://{{ .Values.database.user}}:{{ .Values.database.password }}@{{ .Values.database.host }}:{{ .Values.database.port }}/{{ .Values.database.database }}
-{{- end -}}
-
-{{- define "funkwhale.redisUrl" -}}
-redis://:{{ .Values.redis.password }}@{{ .Values.redis.host }}:{{ .Values.redis.redisPort }}/0
+postgres://{{ .Values.database.user }}:{{ .Values.database.password }}@{{ .Values.database.host }}:{{ .Values.database.port }}/{{ .Values.database.database }}
 {{- end -}}
 
 {{/*
@@ -45,3 +41,15 @@ Create the correct image tag name
 {{- define "funkwhale.imageTag" -}}
 {{- .Values.image.tag | default .Chart.AppVersion -}}
 {{- end -}}
+
+{{- define "funkwhale.redisUrl" -}}
+{{- if and .Values.redis.enabled .Values.redis.host -}}
+{{ fail "Setting both redis.enabled and redis.host will deploy an internal Redis service and attempt to use an external one - please set only one of the two!" }}
+{{- else if .Values.redis.enabled -}}
+redis://:{{ .Values.redis.password }}@{{ template "funkwhale.fullname" . }}:{{ .Values.redis.redisPort }}/0
+{{- else if .Values.redis.host -}}
+redis://:{{ .Values.redis.password }}@{{ .Values.redis.host }}:{{ .Values.redis.redisPort }}/0
+{{- else -}}
+{{ fail "Either redis.enabled or redis.host are required!" }}
+{{- end -}}
+{{- end -}}
diff --git a/charts/funkwhale/values.yaml b/charts/funkwhale/values.yaml
index 14d4006..3fc2efe 100644
--- a/charts/funkwhale/values.yaml
+++ b/charts/funkwhale/values.yaml
@@ -51,7 +51,7 @@ redis:
   # this to false and adjust the host to use your existing service.
   enabled: true
 
-  host: {{ template "funkwhale.fullname" . }}-redis-master
+  host: ''
   redisPort: 6379
   password: funkwhale