diff --git a/puppet/zulip/templates/postgresql/10/postgresql.conf.centos.template.erb b/puppet/zulip/templates/postgresql/10/postgresql.conf.centos.template.erb
index c47f4f0775..5abfe5493a 100644
--- a/puppet/zulip/templates/postgresql/10/postgresql.conf.centos.template.erb
+++ b/puppet/zulip/templates/postgresql/10/postgresql.conf.centos.template.erb
@@ -701,6 +701,7 @@ archive_mode = on
 archive_command = '/usr/local/bin/env-wal-g wal-push %p'
 
 # Replica settings (ignored on primary)
+recovery_target_timeline = 'latest'
 hot_standby = on
 <% end -%>
 
diff --git a/puppet/zulip/templates/postgresql/10/postgresql.conf.template.erb b/puppet/zulip/templates/postgresql/10/postgresql.conf.template.erb
index ef45101ea2..d3a605df6c 100644
--- a/puppet/zulip/templates/postgresql/10/postgresql.conf.template.erb
+++ b/puppet/zulip/templates/postgresql/10/postgresql.conf.template.erb
@@ -701,6 +701,7 @@ archive_mode = on
 archive_command = '/usr/local/bin/env-wal-g wal-push %p'
 
 # Replica settings (ignored on primary)
+recovery_target_timeline = 'latest'
 hot_standby = on
 <% end -%>
 
diff --git a/puppet/zulip/templates/postgresql/11/postgresql.conf.template.erb b/puppet/zulip/templates/postgresql/11/postgresql.conf.template.erb
index ef45101ea2..d3a605df6c 100644
--- a/puppet/zulip/templates/postgresql/11/postgresql.conf.template.erb
+++ b/puppet/zulip/templates/postgresql/11/postgresql.conf.template.erb
@@ -701,6 +701,7 @@ archive_mode = on
 archive_command = '/usr/local/bin/env-wal-g wal-push %p'
 
 # Replica settings (ignored on primary)
+recovery_target_timeline = 'latest'
 hot_standby = on
 <% end -%>
 
diff --git a/puppet/zulip/templates/postgresql/12/postgresql.conf.template.erb b/puppet/zulip/templates/postgresql/12/postgresql.conf.template.erb
index 87a5c0883d..09b0b21755 100644
--- a/puppet/zulip/templates/postgresql/12/postgresql.conf.template.erb
+++ b/puppet/zulip/templates/postgresql/12/postgresql.conf.template.erb
@@ -795,6 +795,7 @@ archive_mode = on
 archive_command = '/usr/local/bin/env-wal-g wal-push %p'
 
 # Replica settings (ignored on primary)
+recovery_target_timeline = 'latest'
 hot_standby = on
 <% end -%>
 
diff --git a/puppet/zulip/templates/postgresql/9.5/postgresql.conf.template.erb b/puppet/zulip/templates/postgresql/9.5/postgresql.conf.template.erb
index aa03f8e7f2..432f17c5fc 100644
--- a/puppet/zulip/templates/postgresql/9.5/postgresql.conf.template.erb
+++ b/puppet/zulip/templates/postgresql/9.5/postgresql.conf.template.erb
@@ -673,6 +673,7 @@ archive_mode = on
 archive_command = '/usr/local/bin/env-wal-g wal-push %p'
 
 # Replica settings (ignored on primary)
+recovery_target_timeline = 'latest'
 hot_standby = on
 <% end -%>
 
diff --git a/puppet/zulip/templates/postgresql/9.6/postgresql.conf.template.erb b/puppet/zulip/templates/postgresql/9.6/postgresql.conf.template.erb
index ed5d56566f..08cf43d2ec 100644
--- a/puppet/zulip/templates/postgresql/9.6/postgresql.conf.template.erb
+++ b/puppet/zulip/templates/postgresql/9.6/postgresql.conf.template.erb
@@ -686,6 +686,7 @@ archive_mode = on
 archive_command = '/usr/local/bin/env-wal-g wal-push %p'
 
 # Replica settings (ignored on primary)
+recovery_target_timeline = 'latest'
 hot_standby = on
 <% end -%>