diff --git a/Jellyfin.Plugin.MediaBarEnhanced/Web/mediaBarEnhanced.js b/Jellyfin.Plugin.MediaBarEnhanced/Web/mediaBarEnhanced.js
index 42288af..1f999b6 100644
--- a/Jellyfin.Plugin.MediaBarEnhanced/Web/mediaBarEnhanced.js
+++ b/Jellyfin.Plugin.MediaBarEnhanced/Web/mediaBarEnhanced.js
@@ -1833,11 +1833,7 @@ const SlideCreator = {
                   if (event.data === YT.PlayerState.ENDED) {
                     const slide = document.querySelector(`.slide[data-item-id="${itemId}"]`);
                     if (slide && slide.classList.contains('active')) {
-                      if (CONFIG.waitForTrailerToEnd) {
-                        SlideshowManager.nextSlide();
-                      } else {
-                        event.target.playVideo(); // Loop if trailer is shorter than slide duration
-                      }
+                      SlideshowManager.nextSlide();
                     }
                   }
                 },
@@ -1887,16 +1883,17 @@ const SlideCreator = {
           }
         });
 
-        backdrop.addEventListener('ended', () => {
-            const slide = document.querySelector(`.slide[data-item-id="${itemId}"]`);
+        backdrop.addEventListener('ended', (event) => {
+            const slide = event.target.closest('.slide');
             if (slide && slide.classList.contains('active')) {
               SlideshowManager.nextSlide();
             }
         });
 
-        backdrop.addEventListener('error', () => {
-          const slide = document.querySelector(`.slide[data-item-id="${itemId}"]`);
-          if (CONFIG.waitForTrailerToEnd && slide && slide.classList.contains('active')) {
+        backdrop.addEventListener('error', (event) => {
+          console.warn(`Local video error for item ${itemId}`);
+          const slide = event.target.closest('.slide');
+          if (slide && slide.classList.contains('active')) {
             SlideshowManager.nextSlide();
           }
         });