diff --git a/src/patroni.py b/src/patroni.py
index 98907cbad2..5e8b1937fd 100644
--- a/src/patroni.py
+++ b/src/patroni.py
@@ -451,7 +451,13 @@ def bulk_update_parameters_controller_by_patroni(self, parameters: dict[str, Any
         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 e47d688e85..f8a05dabd4 100644
--- a/templates/patroni.yml.j2
+++ b/templates/patroni.yml.j2
@@ -5,8 +5,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
       bin_dir: /usr/lib/postgresql/{{ version }}/bin
       parameters:
         synchronous_standby_names: "*"
diff --git a/tests/integration/test_charm.py b/tests/integration/test_charm.py
index 69a71e74ab..ccc7fc15c0 100644
--- a/tests/integration/test_charm.py
+++ b/tests/integration/test_charm.py
@@ -163,8 +163,8 @@ async def test_settings_are_correct(ops_test: OpsTest, unit_id: int):
 
     # Validate configuration exposed by 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
 
 
 async def test_postgresql_parameters_change(ops_test: OpsTest) -> None: