diff --git a/audio/channel_send.cc b/audio/channel_send.cc
index b683cc335e..888dfaf7fe 100644
--- a/audio/channel_send.cc
+++ b/audio/channel_send.cc
@@ -313,11 +313,27 @@ class RtpPacketSenderProxy : public RtpPacketSender {
   void EnqueuePackets(
       std::vector<std::unique_ptr<RtpPacketToSend>> packets) override {
     MutexLock lock(&mutex_);
+
+    // Since we allow having an instance with no rtp_packet_pacer_ set we
+    // should handle calls to member functions in this state gracefully rather
+    // than null dereferencing.
+    if (!rtp_packet_pacer_) {
+      RTC_DLOG(LS_WARNING)
+          << "Dropping packets queued while rtp_packet_pacer_ is null.";
+      return;
+    }
     rtp_packet_pacer_->EnqueuePackets(std::move(packets));
   }
 
   void RemovePacketsForSsrc(uint32_t ssrc) override {
     MutexLock lock(&mutex_);
+
+    // Since we allow having an instance with no rtp_packet_pacer_ set we
+    // should handle calls to member functions in this state gracefully rather
+    // than null dereferencing.
+    if (!rtp_packet_pacer_) {
+      return;
+    }
     rtp_packet_pacer_->RemovePacketsForSsrc(ssrc);
   }
 
diff --git a/audio/channel_send_unittest.cc b/audio/channel_send_unittest.cc
index 38198594b5..3535a9908e 100644
--- a/audio/channel_send_unittest.cc
+++ b/audio/channel_send_unittest.cc
@@ -362,6 +362,25 @@ TEST_F(ChannelSendTest, UsedRateIsLargerofLastTwoFrames) {
   EXPECT_EQ(used_rate_3, used_rate_2);
 }
 
+// Test that we gracefully handle packets while the congestion control objects
+// are not configured. This can happen during calls
+// AudioSendStream::ConfigureStream
+TEST_F(ChannelSendTest, EnqueuePacketsGracefullyHandlesNonInitializedPacer) {
+  EXPECT_CALL(transport_, SendRtp).Times(1);
+  channel_->StartSend();
+  channel_->ResetSenderCongestionControlObjects();
+  // This should trigger a packet, but congestion control is not configured
+  // so it should be dropped
+  ProcessNextFrame();
+  ProcessNextFrame();
+
+  channel_->RegisterSenderCongestionControlObjects(&transport_controller_);
+  // Now that we reconfigured the congestion control objects the new frame
+  // should be processed
+  ProcessNextFrame();
+  ProcessNextFrame();
+}
+
 }  // namespace
 }  // namespace voe
 }  // namespace webrtc