diff --git a/src/LivewireModalServiceProvider.php b/src/LivewireModalServiceProvider.php
index 263403d..63a304b 100644
--- a/src/LivewireModalServiceProvider.php
+++ b/src/LivewireModalServiceProvider.php
@@ -20,15 +20,5 @@ public function configurePackage(Package $package): void
     public function bootingPackage(): void
     {
         Livewire::component('livewire-ui-modal', Modal::class);
-
-        View::composer('livewire-ui-modal::modal', function ($view) {
-            if (config('livewire-ui-modal.include_js', true)) {
-                $view->jsPath = __DIR__.'/../public/modal.js';
-            }
-
-            if (config('livewire-ui-modal.include_css', false)) {
-                $view->cssPath = __DIR__ . '/../public/modal.css';
-            }
-        });
     }
 }
diff --git a/src/Modal.php b/src/Modal.php
index 27850c3..a8299ba 100644
--- a/src/Modal.php
+++ b/src/Modal.php
@@ -64,6 +64,17 @@ public function getListeners(): array
 
     public function render(): View
     {
-        return view('livewire-ui-modal::modal');
+        if (config('livewire-ui-modal.include_js', true)) {
+            $jsPath = __DIR__.'/../public/modal.js';
+        }
+
+        if (config('livewire-ui-modal.include_css', false)) {
+            $cssPath = __DIR__ . '/../public/modal.css';
+        }
+
+        return view('livewire-ui-modal::modal', [
+            'jsPath' => $jsPath ?? null,
+            'cssPath' => $cssPath ?? null,
+        ]);
     }
 }