diff --git a/src/config.js b/src/config.js
index 6ccb0adc3..6a0a00716 100644
--- a/src/config.js
+++ b/src/config.js
@@ -12,7 +12,7 @@ export default {
   BUFFER_LOW_WATER_LINE: 0,
   MAX_BUFFER_LOW_WATER_LINE: 30,
 
-  // TODO: Remove this when useBufferWaterLines is removed
+  // TODO: Remove this when experimentalBufferBasedABR is removed
   EXPERIMENTAL_MAX_BUFFER_LOW_WATER_LINE: 16,
 
   BUFFER_LOW_WATER_LINE_RATE: 1,
diff --git a/src/master-playlist-controller.js b/src/master-playlist-controller.js
index 9486ce127..36ec729af 100644
--- a/src/master-playlist-controller.js
+++ b/src/master-playlist-controller.js
@@ -643,6 +643,8 @@ export class MasterPlaylistController extends videojs.EventTarget {
         return;
       }
 
+      this.delegateLoaders_('all', ['abort']);
+
       this.blacklistCurrentPlaylist({
         message: 'Aborted early because there isn\'t enough bandwidth to complete the ' +
           'request without rebuffering.'