diff --git a/ceph-client/Chart.yaml b/ceph-client/Chart.yaml
index 7670e4b6b..0170fb92e 100644
--- a/ceph-client/Chart.yaml
+++ b/ceph-client/Chart.yaml
@@ -15,6 +15,6 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Ceph Client
 name: ceph-client
-version: 0.1.25
+version: 0.1.26
 home: https://github.com/ceph/ceph-client
 ...
diff --git a/ceph-client/templates/bin/pool/_init.sh.tpl b/ceph-client/templates/bin/pool/_init.sh.tpl
index 0f4c21f95..a2c05bf33 100644
--- a/ceph-client/templates/bin/pool/_init.sh.tpl
+++ b/ceph-client/templates/bin/pool/_init.sh.tpl
@@ -384,6 +384,8 @@ if [[ -n $(grep ^{{ .name }}$ <<< "${pool_list}") ]] &&
 fi
 {{- end }}
 {{- if and .delete .delete_all_pool_data }}
+# Wait for manage_pool() to finish for this pool before trying to delete the pool
+wait_for_pid $MANAGE_POOL_PID
 # If delete is set to true and delete_all_pool_data is also true, delete the pool
 if [[ "true" == "{{ .delete }}" ]] &&
    [[ "true" == "{{ .delete_all_pool_data }}" ]]; then
diff --git a/releasenotes/notes/ceph-client.yaml b/releasenotes/notes/ceph-client.yaml
index 8a380151a..1e6e2e6d6 100644
--- a/releasenotes/notes/ceph-client.yaml
+++ b/releasenotes/notes/ceph-client.yaml
@@ -26,4 +26,5 @@ ceph-client:
   - 0.1.23 Helm 3 - Fix Job labels
   - 0.1.24 Performance optimizations for the ceph-rbd-pool job
   - 0.1.25 Update htk requirements
+  - 0.1.26 Fix ceph-rbd-pool deletion race
 ...