diff --git a/src/cluster.py b/src/cluster.py
index 19a6093d40..75177bbb89 100644
--- a/src/cluster.py
+++ b/src/cluster.py
@@ -1107,7 +1107,13 @@ def bulk_update_parameters_controller_by_patroni(self, parameters: dict[str, Any
         r = requests.patch(
             f"{self._patroni_url}/config",
             verify=self.verify,
-            json={"postgresql": {"parameters": parameters}},
+            json={
+                "postgresql": {
+                    "remove_data_directory_on_rewind_failure": False,
+                    "remove_data_directory_on_diverged_timelines": False,
+                    "parameters": parameters,
+                }
+            },
             auth=self._patroni_auth,
             timeout=PATRONI_TIMEOUT,
         )
diff --git a/templates/patroni.yml.j2 b/templates/patroni.yml.j2
index f5b26129db..aad1ed2a39 100644
--- a/templates/patroni.yml.j2
+++ b/templates/patroni.yml.j2
@@ -56,8 +56,8 @@ bootstrap:
     synchronous_node_count: {{ synchronous_node_count }}
     postgresql:
       use_pg_rewind: true
-      remove_data_directory_on_rewind_failure: true
-      remove_data_directory_on_diverged_timelines: true
+      remove_data_directory_on_rewind_failure: false
+      remove_data_directory_on_diverged_timelines: false
       parameters:
         synchronous_standby_names: "*"
         {%- if enable_pgbackrest_archiving %}
diff --git a/tests/integration/test_charm.py b/tests/integration/test_charm.py
index 0da5b7dec0..f9a3af31f3 100644
--- a/tests/integration/test_charm.py
+++ b/tests/integration/test_charm.py
@@ -154,8 +154,8 @@ async def test_settings_are_correct(ops_test: OpsTest, unit_id: int):
 
     # Validate each configuration related to Patroni
     assert settings["postgresql"]["use_pg_rewind"] is True
-    assert settings["postgresql"]["remove_data_directory_on_rewind_failure"] is True
-    assert settings["postgresql"]["remove_data_directory_on_diverged_timelines"] is True
+    assert settings["postgresql"]["remove_data_directory_on_rewind_failure"] is False
+    assert settings["postgresql"]["remove_data_directory_on_diverged_timelines"] is False
     assert settings["loop_wait"] == 10
     assert settings["retry_timeout"] == 10
     assert settings["maximum_lag_on_failover"] == 1048576