diff --git a/resources/js/preview.js b/resources/js/preview.js
index f80a5af..25af1dd 100644
--- a/resources/js/preview.js
+++ b/resources/js/preview.js
@@ -1,56 +1,52 @@
-const sleep = (ms = 0) => new Promise(resolve => setTimeout(resolve, ms));
-var old_timestamp = document.getElementById('ts_reference').value;
+function initGalleryPreviews() {
+    const previews = document.querySelectorAll('.preview-gallery');
 
-function initPreviews() {
-    var thumbs = document.querySelectorAll('div[data-thumbs]');
-    thumbs.forEach(function (thumb) {
-        var thumbsJSON = JSON.parse(thumb.dataset.thumbs);
-        var originalImage = thumb.children[0].children[1].src;
-        var interval;
-        var i = 1;
+    previews.forEach((img) => {
+        // Prevent double initialization
+        if (img.dataset.previewInitialized) return;
 
-        function clear() {
-            thumb.children[0].children[1].src = originalImage;
-            i = 1;
-            clearTimeout(interval);
+        img.dataset.previewInitialized = 'true';
+
+        let images = [];
+
+        try {
+            images = JSON.parse(img.dataset.gallery);
+        } catch (e) {
+            console.error('Invalid gallery JSON', e);
+            return;
         }
 
-        function toggle() {
-            if (i == 0) {
-                clear();
-                return;
-            }
+        if (images.length <= 1) return;
 
-            thumb.children[0].children[1].src = thumbsJSON[i];
-            i = (i + 1) % thumbsJSON.length;
-        }
+        const original = img.src;
 
-        function interval() {
-            // Start Preview
-            interval = setInterval(toggle, 700);
-        }
+        let index = 0;
+        let interval = null;
 
-        thumb.addEventListener('mouseenter', interval);
-        thumb.addEventListener('mouseleave', clear);
+        const startPreview = () => {
+            console.log("startPreview");
+            interval = setInterval(() => {
+                index = (index + 1) % images.length;
+                img.src = images[index];
+            }, 700);
+        };
+
+        const stopPreview = () => {
+            console.log("stopPreview");
+            clearInterval(interval);
+            interval = null;
+
+            index = 0;
+            img.src = original;
+        };
+
+        img.addEventListener('mouseenter', startPreview);
+        img.addEventListener('mouseleave', stopPreview);
     });
 }
 
-async function init() {
-    for (let i = 0; i < 9; i++) {
-        var new_timestamp = document.getElementById('ts_reference').value;
-        if (new_timestamp != old_timestamp) {
-            console.log('== Changed ==');
-            initPreviews();
-            break;
-        }
-        console.log('== Didnt Change ==');
-        await sleep(1000);
-    }
-}
+// Initial page load
+document.addEventListener('DOMContentLoaded', initGalleryPreviews);
 
-window.addEventListener('contentChanged', event => {
-    console.log('== Received contentChanged Event ==');
-    init();
-});
-
-initPreviews();
\ No newline at end of file
+// Livewire v3 navigation/update
+document.addEventListener('contentChanged', initGalleryPreviews);
\ No newline at end of file
diff --git a/resources/views/components/episode-cover.blade.php b/resources/views/components/episode-cover.blade.php
index d860975..a001d29 100644
--- a/resources/views/components/episode-cover.blade.php
+++ b/resources/views/components/episode-cover.blade.php
@@ -38,12 +38,19 @@
                     class="aspect-[11/16] w-full object-cover object-center transform-gpu transition-transform duration-500 group-hover:scale-[1.02]"
                 >
             @elseif ($view === 'thumbnail')
+                @php
+                    $galleryImages = $episode->gallery
+                        ->pluck('thumbnail_url')
+                        ->filter()
+                        ->values();
+                @endphp
                 <img
-                    src="{{ $episode->gallery->first()?->thumbnail_url }}"
+                    src="{{ $galleryImages->first() }}"
                     alt="{{ $episode->title }} - {{ $episode->episode }}"
                     loading="lazy"
                     width="1000"
-                    class="w-full object-cover object-center transform-gpu transition-transform duration-500 group-hover:scale-[1.02]"
+                    data-gallery='@json($galleryImages)'
+                    class="preview-gallery aspect-video w-full object-cover object-center transform-gpu transition-transform duration-500 group-hover:scale-[1.02]"
                 >
             @endif
 
diff --git a/resources/views/layouts/footer.blade.php b/resources/views/layouts/footer.blade.php
index 6cef293..925a136 100644
--- a/resources/views/layouts/footer.blade.php
+++ b/resources/views/layouts/footer.blade.php
@@ -94,3 +94,6 @@
 
 <!-- Modals -->
 @include('modals.language-selector')
+
+<!-- Thumbnail hover -->
+@vite(['resources/js/preview.js'])
\ No newline at end of file
diff --git a/resources/views/livewire/live-search.blade.php b/resources/views/livewire/live-search.blade.php
index 52d0d7e..3072bcc 100644
--- a/resources/views/livewire/live-search.blade.php
+++ b/resources/views/livewire/live-search.blade.php
@@ -24,5 +24,4 @@
         </div>
         {{ $episodes->appends(['tags' => $selectedtags])->links('pagination::tailwind') }}
     </div>
-    @vite(['resources/js/preview.js'])
 </div>
diff --git a/resources/views/livewire/user-likes.blade.php b/resources/views/livewire/user-likes.blade.php
index 4cf6920..8e6edad 100644
--- a/resources/views/livewire/user-likes.blade.php
+++ b/resources/views/livewire/user-likes.blade.php
@@ -24,5 +24,4 @@
         </div>
         {{ $episodes->appends(['tags' => $selectedtags])->links('pagination::tailwind') }}
     </div>
-    @vite(['resources/js/preview.js'])
 </div