diff --git a/production/helm/loki/Chart.yaml b/production/helm/loki/Chart.yaml
index 13795ee04db86..cf5aab6f2df34 100644
--- a/production/helm/loki/Chart.yaml
+++ b/production/helm/loki/Chart.yaml
@@ -1,5 +1,5 @@
 name: loki
-version: 0.8.4
+version: 0.8.5
 appVersion: 0.0.1
 kubeVersion: "^1.10.0-0"
 description: "Loki: like Prometheus, but for logs."
diff --git a/production/helm/loki/templates/deployment.yaml b/production/helm/loki/templates/deployment.yaml
index 9bf061704449c..e8fe9be095c66 100644
--- a/production/helm/loki/templates/deployment.yaml
+++ b/production/helm/loki/templates/deployment.yaml
@@ -70,8 +70,10 @@ spec:
           securityContext:
             readOnlyRootFilesystem: true
           env:
+            {{- if .Values.tracing.jaegerAgentHost }}
             - name: JAEGER_AGENT_HOST
               value: "{{ .Values.tracing.jaegerAgentHost }}"
+            {{- end }}
       nodeSelector:
         {{- toYaml .Values.nodeSelector | nindent 8 }}
       affinity: