diff --git a/resources/js/app.js b/resources/js/app.js
index 21eade0..8fcf5a2 100644
--- a/resources/js/app.js
+++ b/resources/js/app.js
@@ -3,9 +3,7 @@ import Echo from 'laravel-echo';
 import Pusher from 'pusher-js';
 window.Pusher = Pusher;
 
-window.startReverb = function () {
-    if (window.Echo) return window.Echo;
-
+if (document.querySelector('[data-requires-reverb]')) {
     window.Echo = new Echo({
         broadcaster: 'reverb',
         key: import.meta.env.VITE_REVERB_APP_KEY,
@@ -15,6 +13,4 @@ window.startReverb = function () {
         forceTLS: (import.meta.env.VITE_REVERB_SCHEME ?? 'https') === 'https',
         enabledTransports: ['ws', 'wss'],
     });
-
-    return window.Echo;
-};
+}
diff --git a/resources/views/livewire/mailbox.blade.php b/resources/views/livewire/mailbox.blade.php
index a541ba2..b8fba28 100644
--- a/resources/views/livewire/mailbox.blade.php
+++ b/resources/views/livewire/mailbox.blade.php
@@ -1,4 +1,5 @@
 <div class="flex h-full bg-zinc-950 overflow-hidden relative" 
+     data-requires-reverb="true"
      x-data="{ 
         sidebarOpen: window.innerWidth >= 1280, 
         selectedId: @entangle('selectedEmailId'), 
@@ -20,7 +21,7 @@
             });
         }
      }"
-     x-init="window.startReverb(); $watch('selectedId', value => { if(value && window.innerWidth < 1024) mobileView = 'detail' }); $watch('mobileView', value => { if(value === 'list' && window.innerWidth < 1024) selectedId = null })"
+     x-init="$watch('selectedId', value => { if(value && window.innerWidth < 1024) mobileView = 'detail' }); $watch('mobileView', value => { if(value === 'list' && window.innerWidth < 1024) selectedId = null })"
      @resize.window="if (window.innerWidth >= 1280) sidebarOpen = true">
 
     <!-- Global Confirmation Modal -->