diff --git a/bitnami/redis/templates/NOTES.txt b/bitnami/redis/templates/NOTES.txt
index bda50622c0..6e990ab41b 100644
--- a/bitnami/redis/templates/NOTES.txt
+++ b/bitnami/redis/templates/NOTES.txt
@@ -20,6 +20,20 @@
 {{- end }}
 {{- end }}
 
+{{- if and .Values.sentinel.enabled (not .Values.cluster.enabled)}}
+
+-------------------------------------------------------------------------------
+ WARNING
+
+    Using redis sentinel without a cluster is not supported. A single pod with
+    standalone redis has been deployed.
+
+    To deploy redis sentinel, please use the values "cluster.enabled=true" and
+    "sentinel.enabled=true".
+
+-------------------------------------------------------------------------------
+{{- end }}
+
 {{- if .Values.cluster.enabled }}
 {{- if .Values.sentinel.enabled }}
 Redis can be accessed via port {{ .Values.sentinel.service.redisPort }} on the following DNS name from within your cluster:
diff --git a/bitnami/redis/templates/configmap-scripts.yaml b/bitnami/redis/templates/configmap-scripts.yaml
index 87ae32c776..4795c3d586 100644
--- a/bitnami/redis/templates/configmap-scripts.yaml
+++ b/bitnami/redis/templates/configmap-scripts.yaml
@@ -284,7 +284,7 @@ data:
     {{- else }}
     exec redis-server "${ARGS[@]}"
     {{- end }}
-
+  {{- if .Values.cluster.enabled }}
   start-slave.sh: |
     #!/bin/bash
     {{- if (eq (.Values.securityContext.runAsUser | int) 0) }}
@@ -338,5 +338,6 @@ data:
     {{- else }}
     exec redis-server "${ARGS[@]}"
     {{- end }}
+  {{- end }}
 
 {{- end -}}
diff --git a/bitnami/redis/templates/redis-master-statefulset.yaml b/bitnami/redis/templates/redis-master-statefulset.yaml
index 1d55f930a3..36dc4f57bf 100644
--- a/bitnami/redis/templates/redis-master-statefulset.yaml
+++ b/bitnami/redis/templates/redis-master-statefulset.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.cluster.enabled (not .Values.sentinel.enabled) }}
+{{- if or (not .Values.cluster.enabled) (not .Values.sentinel.enabled) }}
 apiVersion: apps/v1
 kind: StatefulSet
 metadata: