diff --git a/servers/puppet/modules/zulip/files/postgresql/postgresql.conf.master b/servers/puppet/modules/zulip/files/postgresql/postgresql.conf.master
index 1a925d8071..21222e0bb6 100644
--- a/servers/puppet/modules/zulip/files/postgresql/postgresql.conf.master
+++ b/servers/puppet/modules/zulip/files/postgresql/postgresql.conf.master
@@ -586,6 +586,10 @@ log_lock_waits = on
 log_temp_files = 0
 log_autovacuum_min_duration = 100
 
+autovacuum_freeze_max_age = 2000000000
+vacuum_freeze_min_age     = 1000000000
+vacuum_freeze_table_age   = 1800000000
+
 # Master replication settings (ignored on standby)
 wal_level = hot_standby
 max_wal_senders = 5
diff --git a/servers/puppet/modules/zulip/files/postgresql/postgresql.conf.slave b/servers/puppet/modules/zulip/files/postgresql/postgresql.conf.slave
index 354a6abf51..928c770701 100644
--- a/servers/puppet/modules/zulip/files/postgresql/postgresql.conf.slave
+++ b/servers/puppet/modules/zulip/files/postgresql/postgresql.conf.slave
@@ -582,6 +582,10 @@ log_lock_waits = on
 log_temp_files = 0
 log_autovacuum_min_duration = 100
 
+autovacuum_freeze_max_age = 2000000000
+vacuum_freeze_min_age     = 1000000000
+vacuum_freeze_table_age   = 1800000000
+
 # Master replication settings (ignored on standby)
 wal_level = hot_standby
 max_wal_senders = 2