diff --git a/internal/weave/base_socket.cc b/internal/weave/base_socket.cc
index 583561bf..52dd630e 100644
--- a/internal/weave/base_socket.cc
+++ b/internal/weave/base_socket.cc
@@ -76,6 +76,7 @@ BaseSocket::BaseSocket(const Connection& connection, SocketCallback&& callback)
              }
            },
        .on_disconnected_cb = [this]() { DisconnectQuietly(); }});
+  max_packet_size_ = connection_.GetMaxPacketSize();
 }
 
 BaseSocket::~BaseSocket() {
diff --git a/internal/weave/base_socket_test.cc b/internal/weave/base_socket_test.cc
index f08ef50d..743afbc8 100644
--- a/internal/weave/base_socket_test.cc
+++ b/internal/weave/base_socket_test.cc
@@ -325,7 +325,7 @@ TEST_F(BaseSocketTest, TestResetByControlPacket) {
   nearby::Future<absl::Status> status =
       socket_.Write(ByteArray("\x01\x02\x03"));
   // sleep for 10 ms to allow for packet population
-  absl::SleepFor(absl::Milliseconds(10));
+  absl::SleepFor(absl::Milliseconds(20));
   EXPECT_EQ(connection_.PollWrittenPacket(),
             CreateDataPacket(0, true, false, ByteArray("\x01\x02")).GetBytes());
   socket_.WriteControlPacketProxy(Packet::CreateErrorPacket());