diff --git a/dyn-video-swap/dyn-video-swap-ublock-origin.js b/dyn-video-swap/dyn-video-swap-ublock-origin.js
index ec15dbe..06025c8 100644
--- a/dyn-video-swap/dyn-video-swap-ublock-origin.js
+++ b/dyn-video-swap/dyn-video-swap-ublock-origin.js
@@ -4,6 +4,7 @@ twitch-videoad.js application/javascript
     if ( /(^|\.)twitch\.tv$/.test(document.location.hostname) === false ) { return; }
     var tempVideo = null;
     var disabledVideo = null;
+    var foundAdContainer = false;
     var originalVolume = 0;
     var originalAppendChild = Element.prototype.appendChild;
     Element.prototype.appendChild = function() {
@@ -13,7 +14,17 @@ twitch-videoad.js application/javascript
         }
     };
     function onFoundAd() {
-        if (!disabledVideo) {
+        if (!foundAdContainer) {
+            //hide ad contianers
+            var adContainers = document.querySelectorAll('[data-test-selector="sad-overlay"]');
+            for (var i = 0; i < adContainers.length; i++) {
+                adContainers[i].style.display = "none";
+            }
+            foundAdContainer = adContainers.length > 0;
+        }
+        if (disabledVideo) {
+            disabledVideo.volume = 0;
+        } else {
             //get livestream video element
             var liveVid = document.getElementsByTagName("video");
             if (liveVid.length) {
@@ -23,11 +34,6 @@ twitch-videoad.js application/javascript
                 liveVid.volume = 0;
                 //black out
                 liveVid.style.filter = "brightness(0%)";
-                //hide ad contianers
-                var adContainers = document.querySelectorAll('[data-test-selector="sad-overlay"]');
-                for (var i = 0; i < adContainers.length; i++) {
-                    adContainers[i].style.display = "none";
-                }
                 var createTempStream = async function() {
                     // Create new video stream TODO: Do this with callbacks
                     var channelName = window.location.pathname.substr(1);// TODO: Better way of determining the channel name
@@ -102,6 +108,7 @@ twitch-videoad.js application/javascript
                     disabledVideo.volume = originalVolume;
                     disabledVideo.style.filter = "";
                     disabledVideo = null;
+                    foundAdContainer = false;
                     if (tempVideo) {
                         tempVideo.hls.stopLoad();
                         tempVideo.remove();
diff --git a/mute-black/mute-black-ublock-origin.js b/mute-black/mute-black-ublock-origin.js
index 3c65c54..76c3d3e 100644
--- a/mute-black/mute-black-ublock-origin.js
+++ b/mute-black/mute-black-ublock-origin.js
@@ -3,6 +3,7 @@ twitch-videoad.js application/javascript
 (function() {
     if ( /(^|\.)twitch\.tv$/.test(document.location.hostname) === false ) { return; }
     var disabledVideo = null;
+    var foundAdContainer = false;
     var originalVolume = 0;
     var originalAppendChild = Element.prototype.appendChild;
     Element.prototype.appendChild = function() {
@@ -12,7 +13,17 @@ twitch-videoad.js application/javascript
         }
     };
     function onFoundAd() {
-        if (!disabledVideo) {
+        if (!foundAdContainer) {
+            //hide ad contianers
+            var adContainers = document.querySelectorAll('[data-test-selector="sad-overlay"]');
+            for (var i = 0; i < adContainers.length; i++) {
+                adContainers[i].style.display = "none";
+            }
+            foundAdContainer = adContainers.length > 0;
+        }
+        if (disabledVideo) {
+            disabledVideo.volume = 0;
+        } else {
             //get livestream video element
             var liveVid = document.getElementsByTagName("video");
             if (liveVid.length) {
@@ -22,11 +33,6 @@ twitch-videoad.js application/javascript
                 liveVid.volume = 0;
                 //black out
                 liveVid.style.filter = "brightness(0%)";
-                //hide ad contianers
-                var adContainers = document.querySelectorAll('[data-test-selector="sad-overlay"]');
-                for (var i = 0; i < adContainers.length; i++) {
-                    adContainers[i].style.display = "none";
-                }
             }
         }
     }
@@ -49,6 +55,7 @@ twitch-videoad.js application/javascript
                     disabledVideo.volume = originalVolume;
                     disabledVideo.style.filter = "";
                     disabledVideo = null;
+                    foundAdContainer = false;
                 }
             }
             setTimeout(checkForAd,100);