diff --git a/src/common/controllers/ads-controller.js b/src/common/controllers/ads-controller.js
index 1ddfe33aa..2cb7a0bb0 100644
--- a/src/common/controllers/ads-controller.js
+++ b/src/common/controllers/ads-controller.js
@@ -114,7 +114,6 @@ class AdsController extends FakeEventTarget implements IAdsController {
   _init(): void {
     this._initMembers();
     this._addBindings();
-    this._handleConfiguredAdBreaks();
   }
 
   _initMembers(): void {
@@ -128,6 +127,7 @@ class AdsController extends FakeEventTarget implements IAdsController {
   }
 
   _addBindings(): void {
+    this._eventManager.listen(this._player, CustomEventType.SOURCE_SELECTED, () => this._handleConfiguredAdBreaks());
     this._eventManager.listen(this._player, AdEventType.AD_MANIFEST_LOADED, event => this._onAdManifestLoaded(event));
     this._eventManager.listen(this._player, AdEventType.AD_BREAK_START, event => this._onAdBreakStart(event));
     this._eventManager.listen(this._player, AdEventType.AD_LOADED, () => this._onAdLoaded());
diff --git a/test/src/common/ads/ads-controller.spec.js b/test/src/common/ads/ads-controller.spec.js
index cb6962a80..022635c5c 100644
--- a/test/src/common/ads/ads-controller.spec.js
+++ b/test/src/common/ads/ads-controller.spec.js
@@ -37,6 +37,7 @@ describe('AdsController', () => {
         }
       });
       player.configure({
+        sources: SourcesConfig.Mp4,
         advertising: {
           adBreaks: [
             {percentage: 0, ads: [{}]},