diff --git a/incubator/logstash/Chart.yaml b/incubator/logstash/Chart.yaml
index 04dd860eae..e973beef3e 100644
--- a/incubator/logstash/Chart.yaml
+++ b/incubator/logstash/Chart.yaml
@@ -3,7 +3,7 @@ description: Logstash is an open source, server-side data processing pipeline
 icon: https://www.elastic.co/assets/blt86e4472872eed314/logo-elastic-logstash-lt.svg
 home: https://www.elastic.co/products/logstash
 name: logstash
-version: 0.8.1
+version: 0.8.2
 appVersion: 6.3.2
 sources:
 - https://www.docker.elastic.co
diff --git a/incubator/logstash/templates/statefulset.yaml b/incubator/logstash/templates/statefulset.yaml
index 7d566a9348..95da1e0588 100644
--- a/incubator/logstash/templates/statefulset.yaml
+++ b/incubator/logstash/templates/statefulset.yaml
@@ -130,7 +130,10 @@ spec:
         - name: pipeline
           configMap:
             name: {{ template "logstash.fullname" . }}-pipeline
-
+{{- if not .Values.persistence.enabled }}
+        - name: data
+          emptyDir: {}
+{{- else }}
   volumeClaimTemplates:
     - metadata:
         name: data
@@ -147,3 +150,4 @@ spec:
         storageClassName: "{{ .Values.persistence.storageClass }}"
         {{- end }}
       {{- end }}
+{{- end }}