diff --git a/quic/api/QuicPacketScheduler.cpp b/quic/api/QuicPacketScheduler.cpp
index 58a7a9e14..2b171aae1 100644
--- a/quic/api/QuicPacketScheduler.cpp
+++ b/quic/api/QuicPacketScheduler.cpp
@@ -308,7 +308,7 @@ SchedulingResult FrameScheduler::scheduleFramesForPacket(
         longHeader && longHeader->getHeaderType() == LongHeader::Types::Initial;
     if (initialPacket) {
       // This is the initial packet, we need to fill er up.
-      while (wrapper.remainingSpaceInPkt() > 0) {
+      while (builder.remainingSpaceInPkt() > 0) {
         writeFrame(PaddingFrame(), builder);
       }
     }
diff --git a/quic/api/test/QuicPacketSchedulerTest.cpp b/quic/api/test/QuicPacketSchedulerTest.cpp
index 5b7785ab9..340261adf 100644
--- a/quic/api/test/QuicPacketSchedulerTest.cpp
+++ b/quic/api/test/QuicPacketSchedulerTest.cpp
@@ -227,7 +227,7 @@ TEST_F(QuicPacketSchedulerTest, PaddingInitialPureAcks) {
   EXPECT_EQ(conn.udpSendPacketLen, packetLength);
 }
 
-TEST_F(QuicPacketSchedulerTest, PaddingUpToWrapperSize) {
+TEST_F(QuicPacketSchedulerTest, InitialPaddingDoesNotUseWrapper) {
   QuicClientConnectionState conn(
       FizzClientQuicHandshakeContext::Builder().build());
   auto connId = getTestConnectionId();
@@ -258,7 +258,7 @@ TEST_F(QuicPacketSchedulerTest, PaddingUpToWrapperSize) {
       std::move(builder), conn.udpSendPacketLen - cipherOverhead);
   auto packetLength = result.packet->header->computeChainDataLength() +
       result.packet->body->computeChainDataLength();
-  EXPECT_EQ(conn.udpSendPacketLen - cipherOverhead, packetLength);
+  EXPECT_EQ(conn.udpSendPacketLen, packetLength);
 }
 
 TEST_F(QuicPacketSchedulerTest, CryptoServerInitialPadded) {