diff --git a/addons-cluster/redis-cluster/templates/_helpers.tpl b/addons-cluster/redis-cluster/templates/_helpers.tpl
index e08852f9f..a8ffaf97e 100644
--- a/addons-cluster/redis-cluster/templates/_helpers.tpl
+++ b/addons-cluster/redis-cluster/templates/_helpers.tpl
@@ -20,20 +20,24 @@ Define redis cluster shardingSpec with ComponentDefinition.
       serviceType: LoadBalancer
       podService: true
       {{- include "kblib.loadBalancerAnnotations" . | indent 4 }}
+    {{- end }}
     env:
-    - name: LOAD_BALANCER_ENABLED
+    {{- if and .Values.hostNetworkEnabled (not .Values.nodePortEnabled) (not .Values.fixedPodIPEnabled) (not .Values.loadBalancerEnabled) }}
+    - name: HOST_NETWORK_ENABLED
       value: "true"
     {{- end }}
     {{- if and .Values.fixedPodIPEnabled (not .Values.nodePortEnabled) (not .Values.hostNetworkEnabled) (not .Values.loadBalancerEnabled)  }}
-    env:
     - name: FIXED_POD_IP_ENABLED
       value: "true"
     {{- end }}
-    {{- if and .Values.hostNetworkEnabled (not .Values.nodePortEnabled) (not .Values.fixedPodIPEnabled) (not .Values.loadBalancerEnabled) }}
-    env:
-    - name: HOST_NETWORK_ENABLED
+    {{- if and .Values.loadBalancerEnabled (not .Values.fixedPodIPEnabled) (not .Values.hostNetworkEnabled) (not .Values.nodePortEnabled) }}
+    - name: LOAD_BALANCER_ENABLED
       value: "true"
     {{- end }}
+    {{- if .Values.emptyDefaultPassword }}
+    - name: REDIS_DEFAULT_PASSWORD
+      value: ""
+    {{- end }}
     serviceVersion: {{ .Values.version }}
     systemAccounts:
     - name: default
@@ -100,6 +104,10 @@ Define redis ComponentSpec with ComponentDefinition.
   - name: HOST_NETWORK_ENABLED
     value: "true"
   {{- end }}
+  {{- if .Values.emptyDefaultPassword }}
+  - name: REDIS_DEFAULT_PASSWORD
+    value: ""
+  {{- end }}
   enabledLogs:
     - running
   serviceAccountName: {{ include "kblib.serviceAccountName" . }}
diff --git a/addons-cluster/redis-cluster/values.yaml b/addons-cluster/redis-cluster/values.yaml
index b26b5f546..f23608459 100644
--- a/addons-cluster/redis-cluster/values.yaml
+++ b/addons-cluster/redis-cluster/values.yaml
@@ -99,3 +99,5 @@ redisCluster:
   customSecretName: ""
   customSecretNamespace: ""
 
+emptyDefaultPassword: false
+