diff --git a/modules/video_coding/codecs/vp8/libvpx_vp8_encoder.cc b/modules/video_coding/codecs/vp8/libvpx_vp8_encoder.cc
index 98d5e3c44d..4eedb85cb9 100644
--- a/modules/video_coding/codecs/vp8/libvpx_vp8_encoder.cc
+++ b/modules/video_coding/codecs/vp8/libvpx_vp8_encoder.cc
@@ -695,9 +695,10 @@ uint32_t LibvpxVp8Encoder::FrameDropThreshold(size_t spatial_idx) const {
   // setting, as eg. ScreenshareLayers does not work as intended with frame
   // dropping on and DefaultTemporalLayers will have performance issues with
   // frame dropping off.
-  RTC_CHECK_LT(spatial_idx, frame_buffer_controllers_.size());
-  enable_frame_dropping =
-      frame_buffer_controllers_[spatial_idx]->SupportsEncoderFrameDropping();
+  if (frame_buffer_controllers_.size() <= spatial_idx) {
+    enable_frame_dropping =
+        frame_buffer_controllers_[spatial_idx]->SupportsEncoderFrameDropping();
+  }
   return enable_frame_dropping ? 30 : 0;
 }
 
diff --git a/video/quality_scaling_tests.cc b/video/quality_scaling_tests.cc
index 19b9e8c36c..4f68eb1cc1 100644
--- a/video/quality_scaling_tests.cc
+++ b/video/quality_scaling_tests.cc
@@ -169,9 +169,7 @@ TEST_F(QualityScalingTest, NoAdaptDownForHighQpWithResizeOff_Vp8) {
           kFrameDropping, kExpectAdapt);
 }
 
-// TODO(bugs.webrtc.org/10388): Fix and re-enable.
-TEST_F(QualityScalingTest,
-       DISABLED_NoAdaptDownForHighQpWithFrameDroppingOff_Vp8) {
+TEST_F(QualityScalingTest, NoAdaptDownForHighQpWithFrameDroppingOff_Vp8) {
   // VP8 QP thresholds, low:1, high:1 -> high QP.
   test::ScopedFieldTrials field_trials(kPrefix + "1,1,0,0,0,0" + kEnd);