diff --git a/quic/api/QuicPacketScheduler.cpp b/quic/api/QuicPacketScheduler.cpp
index d3032a620..3c0570549 100644
--- a/quic/api/QuicPacketScheduler.cpp
+++ b/quic/api/QuicPacketScheduler.cpp
@@ -473,9 +473,7 @@ bool CryptoStreamScheduler::writeCryptoData(PacketBuilderInterface& builder) {
     const LongHeader* longHeader = builder.getPacketHeader().asLong();
     bool initialPacket =
         longHeader && longHeader->getHeaderType() == LongHeader::Types::Initial;
-    if (initialPacket &&
-        (conn_.nodeType == QuicNodeType::Client ||
-         longHeader->getPacketSequenceNum() == 0)) {
+    if (initialPacket) {
       // This is the initial packet, we need to fill er up.
       while (builder.remainingSpaceInPkt() > 0) {
         writeFrame(PaddingFrame(), builder);
diff --git a/quic/api/test/QuicPacketSchedulerTest.cpp b/quic/api/test/QuicPacketSchedulerTest.cpp
index c409171a5..b7a65820b 100644
--- a/quic/api/test/QuicPacketSchedulerTest.cpp
+++ b/quic/api/test/QuicPacketSchedulerTest.cpp
@@ -174,7 +174,7 @@ TEST_F(QuicPacketSchedulerTest, CryptoServerInitialPadded) {
   writeDataToQuicStream(
       conn.cryptoState->initialStream, folly::IOBuf::copyBuffer("shlo"));
   scheduler.writeCryptoData(builder2);
-  EXPECT_GT(builder2.remainingSpaceInPkt(), 0);
+  EXPECT_EQ(builder2.remainingSpaceInPkt(), 0);
 }
 
 TEST_F(QuicPacketSchedulerTest, CryptoPaddingRetransmissionClientInitial) {