diff --git a/es-data.yaml b/es-data.yaml
index a4805bc..bdc0a02 100644
--- a/es-data.yaml
+++ b/es-data.yaml
@@ -47,6 +47,11 @@ spec:
         ports:
         - containerPort: 9300
           name: transport
+        lifecycle:
+          preStop:
+            httpGet:
+              path: /_cluster/health?wait_for_status=green&timeout=28800s
+              port: 9300
         livenessProbe:
           tcpSocket:
             port: transport
diff --git a/stateful/es-data-stateful.yaml b/stateful/es-data-stateful.yaml
index 13be840..21be1e5 100644
--- a/stateful/es-data-stateful.yaml
+++ b/stateful/es-data-stateful.yaml
@@ -45,6 +45,11 @@ spec:
           value: "false"
         - name: ES_JAVA_OPTS
           value: -Xms256m -Xmx256m
+        lifecycle:
+          preStop:
+            httpGet:
+              path: /_cluster/health?wait_for_status=green&timeout=28800s
+              port: 9300
         ports:
         - containerPort: 9300
           name: transport