diff --git a/modules/rtp_rtcp/source/rtp_sender.cc b/modules/rtp_rtcp/source/rtp_sender.cc
index 0ab938b610..76cc19c2fc 100644
--- a/modules/rtp_rtcp/source/rtp_sender.cc
+++ b/modules/rtp_rtcp/source/rtp_sender.cc
@@ -1007,11 +1007,14 @@ std::vector<std::unique_ptr<RtpPacketToSend>> RTPSender::GeneratePadding(
   std::vector<std::unique_ptr<RtpPacketToSend>> padding_packets;
   size_t bytes_left = target_size_bytes;
   if ((rtx_ & kRtxRedundantPayloads) != 0) {
-    while (bytes_left >= kMinPayloadPaddingBytes) {
+    while (bytes_left >= 0) {
       std::unique_ptr<RtpPacketToSend> packet =
           packet_history_.GetPayloadPaddingPacket(
               [&](const RtpPacketToSend& packet)
                   -> std::unique_ptr<RtpPacketToSend> {
+                if (packet.payload_size() + kRtxHeaderSize > bytes_left) {
+                  return nullptr;
+                }
                 return BuildRtxPacket(packet);
               });
       if (!packet) {
diff --git a/modules/rtp_rtcp/source/rtp_sender_unittest.cc b/modules/rtp_rtcp/source/rtp_sender_unittest.cc
index b5703363fb..d2761ea347 100644
--- a/modules/rtp_rtcp/source/rtp_sender_unittest.cc
+++ b/modules/rtp_rtcp/source/rtp_sender_unittest.cc
@@ -2549,9 +2549,6 @@ TEST_P(RtpSenderTest, TrySendPacketUpdatesStats) {
 }
 
 TEST_P(RtpSenderTest, GeneratePaddingResendsOldPacketsWithRtx) {
-  // Min requested size in order to use RTX payload.
-  const size_t kMinPaddingSize = 50;
-
   rtp_sender_->SetRtxStatus(kRtxRetransmitted | kRtxRedundantPayloads);
   rtp_sender_->SetRtxPayloadType(kRtxPayload, kPayload);
   rtp_sender_->SetStorePacketsStatus(true, 1);
@@ -2569,7 +2566,7 @@ TEST_P(RtpSenderTest, GeneratePaddingResendsOldPacketsWithRtx) {
   // Generated padding has large enough budget that the video packet should be
   // retransmitted as padding.
   std::vector<std::unique_ptr<RtpPacketToSend>> generated_packets =
-      rtp_sender_->GeneratePadding(kMinPaddingSize);
+      rtp_sender_->GeneratePadding(kPayloadPacketSize + kRtxHeaderSize);
   ASSERT_EQ(generated_packets.size(), 1u);
   auto& padding_packet = generated_packets.front();
   EXPECT_EQ(padding_packet->packet_type(), RtpPacketToSend::Type::kPadding);
@@ -2578,11 +2575,13 @@ TEST_P(RtpSenderTest, GeneratePaddingResendsOldPacketsWithRtx) {
             kPayloadPacketSize + kRtxHeaderSize);
 
   // Not enough budged for payload padding, use plain padding instead.
-  const size_t kPaddingBytesRequested = kMinPaddingSize - 1;
+  const size_t kPaddingBytesRequested = kPayloadPacketSize + kRtxHeaderSize - 1;
+  const size_t kExpectedNumPaddingPackets =
+      (kPaddingBytesRequested + kMaxPaddingSize - 1) / kMaxPaddingSize;
 
   size_t padding_bytes_generated = 0;
   generated_packets = rtp_sender_->GeneratePadding(kPaddingBytesRequested);
-  EXPECT_EQ(generated_packets.size(), 1u);
+  EXPECT_EQ(generated_packets.size(), kExpectedNumPaddingPackets);
   for (auto& packet : generated_packets) {
     EXPECT_EQ(packet->packet_type(), RtpPacketToSend::Type::kPadding);
     EXPECT_EQ(packet->Ssrc(), kRtxSsrc);
@@ -2591,7 +2590,8 @@ TEST_P(RtpSenderTest, GeneratePaddingResendsOldPacketsWithRtx) {
     padding_bytes_generated += packet->padding_size();
   }
 
-  EXPECT_EQ(padding_bytes_generated, kMaxPaddingSize);
+  EXPECT_EQ(padding_bytes_generated,
+            kExpectedNumPaddingPackets * kMaxPaddingSize);
 }
 
 TEST_P(RtpSenderTest, GeneratePaddingCreatesPurePaddingWithoutRtx) {