diff --git a/storage/cassandra/cassandra-statefulset.yaml b/storage/cassandra/cassandra-statefulset.yaml
index d6f3b1ce..489094a2 100644
--- a/storage/cassandra/cassandra-statefulset.yaml
+++ b/storage/cassandra/cassandra-statefulset.yaml
@@ -34,6 +34,10 @@ spec:
           capabilities:
             add:
               - IPC_LOCK
+        lifecycle:
+          preStop:
+            exec:
+              command: ["/bin/sh", "-c", "PID=$(pidof java) && kill $PID && while ps -p $PID > /dev/null; do sleep 1; done"]
         env:
           - name: MAX_HEAP_SIZE
             value: 512M