diff --git a/modules/video_coding/BUILD.gn b/modules/video_coding/BUILD.gn
index e1aa75744b..eec1e66af4 100644
--- a/modules/video_coding/BUILD.gn
+++ b/modules/video_coding/BUILD.gn
@@ -233,6 +233,7 @@ rtc_library("video_coding") {
     "../../api/video:video_bitrate_allocation",
     "../../api/video:video_bitrate_allocator",
     "../../api/video:video_bitrate_allocator_factory",
+    "../../api/video:video_codec_constants",
     "../../api/video:video_frame",
     "../../api/video:video_frame_type",
     "../../api/video:video_rtp_headers",
diff --git a/modules/video_coding/rtp_generic_ref_finder.cc b/modules/video_coding/rtp_generic_ref_finder.cc
index fd5b8afda1..503a792bd5 100644
--- a/modules/video_coding/rtp_generic_ref_finder.cc
+++ b/modules/video_coding/rtp_generic_ref_finder.cc
@@ -12,6 +12,7 @@
 
 #include <utility>
 
+#include "api/video/video_codec_constants.h"
 #include "rtc_base/logging.h"
 
 namespace webrtc {
@@ -19,6 +20,13 @@ namespace webrtc {
 RtpFrameReferenceFinder::ReturnVector RtpGenericFrameRefFinder::ManageFrame(
     std::unique_ptr<RtpFrameObject> frame,
     const RTPVideoHeader::GenericDescriptorInfo& descriptor) {
+  RtpFrameReferenceFinder::ReturnVector res;
+  if (descriptor.spatial_index >= kMaxSpatialLayers) {
+    RTC_LOG(LS_WARNING) << "Spatial index " << descriptor.spatial_index
+                        << " is unsupported.";
+    return res;
+  }
+
   // Frame IDs are unwrapped in the RtpVideoStreamReceiver, no need to unwrap
   // them here.
   frame->SetId(descriptor.frame_id);
@@ -26,7 +34,6 @@ RtpFrameReferenceFinder::ReturnVector RtpGenericFrameRefFinder::ManageFrame(
   if (descriptor.temporal_index != kNoTemporalIdx)
     frame->SetTemporalIndex(descriptor.temporal_index);
 
-  RtpFrameReferenceFinder::ReturnVector res;
   if (EncodedFrame::kMaxFrameReferences < descriptor.dependencies.size()) {
     RTC_LOG(LS_WARNING) << "Too many dependencies in generic descriptor.";
     return res;