diff --git a/modules/audio_coding/neteq/neteq_impl.cc b/modules/audio_coding/neteq/neteq_impl.cc
index 7e3c4efab9..b415ff5a56 100644
--- a/modules/audio_coding/neteq/neteq_impl.cc
+++ b/modules/audio_coding/neteq/neteq_impl.cc
@@ -798,7 +798,19 @@ int NetEqImpl::GetAudioInternal(AudioFrame* audio_frame,
     RTC_DCHECK(audio_frame->muted());  // Reset() should mute the frame.
     playout_timestamp_ += static_cast<uint32_t>(output_size_samples_);
     audio_frame->sample_rate_hz_ = fs_hz_;
-    audio_frame->samples_per_channel_ = output_size_samples_;
+    // Make sure the total number of samples fits in the AudioFrame.
+    size_t num_output_samples_per_channel = output_size_samples_;
+    size_t num_output_samples = output_size_samples_ * sync_buffer_->Channels();
+    if (num_output_samples > AudioFrame::kMaxDataSizeSamples) {
+      RTC_LOG(LS_WARNING) << "Output array is too short. "
+                          << AudioFrame::kMaxDataSizeSamples << " < "
+                          << output_size_samples_ << " * "
+                          << sync_buffer_->Channels();
+      num_output_samples = AudioFrame::kMaxDataSizeSamples;
+      num_output_samples_per_channel =
+          AudioFrame::kMaxDataSizeSamples / sync_buffer_->Channels();
+    }
+    audio_frame->samples_per_channel_ = num_output_samples_per_channel;
     audio_frame->timestamp_ =
         first_packet_
             ? 0