diff --git a/incubator/jaeger/Chart.yaml b/incubator/jaeger/Chart.yaml
index 7de4658022..847845e0a7 100644
--- a/incubator/jaeger/Chart.yaml
+++ b/incubator/jaeger/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: 1.13.1
 description: A Jaeger Helm chart for Kubernetes
 name: jaeger
-version: 0.12.0
+version: 0.12.1
 keywords:
   - jaeger
   - opentracing
diff --git a/incubator/jaeger/templates/collector-deploy.yaml b/incubator/jaeger/templates/collector-deploy.yaml
index ee7dc7c1c2..df7fbb62f2 100644
--- a/incubator/jaeger/templates/collector-deploy.yaml
+++ b/incubator/jaeger/templates/collector-deploy.yaml
@@ -70,11 +70,13 @@ spec:
                 key: password
           {{- end }}
           {{- if eq .Values.storage.type "elasticsearch" }}
+          {{- if eq .Values.storage.elasticsearch.usePassword }}
           - name: ES_PASSWORD
             valueFrom:
               secretKeyRef:
                 name: {{ if .Values.storage.elasticsearch.existingSecret }}{{ .Values.storage.elasticsearch.existingSecret }}{{- else }}{{ include "jaeger.fullname" . }}-elasticsearch{{- end }}
                 key: password
+          {{- end }}
           - name: ES_SERVER_URLS
             value: {{ template "elasticsearch.client.url" . }}
           - name: ES_USERNAME
diff --git a/incubator/jaeger/templates/query-deploy.yaml b/incubator/jaeger/templates/query-deploy.yaml
index cafbcdc824..69bd7032f5 100644
--- a/incubator/jaeger/templates/query-deploy.yaml
+++ b/incubator/jaeger/templates/query-deploy.yaml
@@ -70,11 +70,13 @@ spec:
                 key: password
           {{- end }}
           {{- if eq .Values.storage.type "elasticsearch" }}
+          {{- if eq .Values.storage.elasticsearch.usePassword }}
           - name: ES_PASSWORD
             valueFrom:
               secretKeyRef:
                 name: {{ if .Values.storage.elasticsearch.existingSecret }}{{ .Values.storage.elasticsearch.existingSecret }}{{- else }}{{ include "jaeger.fullname" . }}-elasticsearch{{- end }}
                 key: password
+          {{- end }}
           - name: ES_SERVER_URLS
             value: {{ template "elasticsearch.client.url" . }}
           - name: ES_USERNAME
diff --git a/incubator/jaeger/templates/spark-cronjob.yaml b/incubator/jaeger/templates/spark-cronjob.yaml
index 90c2b91f02..a0d82e310c 100644
--- a/incubator/jaeger/templates/spark-cronjob.yaml
+++ b/incubator/jaeger/templates/spark-cronjob.yaml
@@ -54,11 +54,13 @@ spec:
               value: {{ template "elasticsearch.client.url" . }}
             - name: ES_NODES_WAN_ONLY
               value: {{ .Values.storage.elasticsearch.nodesWanOnly | quote }}
+            {{- if eq .Values.storage.elasticsearch.usePassword }}
             - name: ES_PASSWORD
               valueFrom:
                 secretKeyRef:
                   name: {{ if .Values.storage.elasticsearch.existingSecret }}{{ .Values.storage.elasticsearch.existingSecret }}{{- else }}{{ include "jaeger.fullname" . }}-elasticsearch{{- end }}
                   key: password
+            {{- end }}
             - name: ES_USERNAME
               value: {{ .Values.storage.elasticsearch.user }}
             {{- end }}