diff --git a/control_plane/src/compute.rs b/control_plane/src/compute.rs
index a2e0b24524..7d1cf439f4 100644
--- a/control_plane/src/compute.rs
+++ b/control_plane/src/compute.rs
@@ -300,7 +300,7 @@ impl PostgresNode {
         conf.append("shared_buffers", "1MB");
         conf.append("fsync", "off");
         conf.append("max_connections", "100");
-        conf.append("wal_sender_timeout", "10s");
+        conf.append("wal_sender_timeout", "0");
         conf.append("wal_level", "replica");
         conf.append("listen_addresses", &self.address.ip().to_string());
         conf.append("port", &self.address.port().to_string());
diff --git a/vendor/postgres b/vendor/postgres
index 2a31a0bb8e..8d42833389 160000
--- a/vendor/postgres
+++ b/vendor/postgres
@@ -1 +1 @@
-Subproject commit 2a31a0bb8ea06dae2d86b0851c547d2f552de770
+Subproject commit 8d42833389a52fe271aef5fdd318d3e224132e98