diff --git a/resources/views/components/layouts/app.blade.php b/resources/views/components/layouts/app.blade.php
index 3d15107..2100397 100644
--- a/resources/views/components/layouts/app.blade.php
+++ b/resources/views/components/layouts/app.blade.php
@@ -1,5 +1,5 @@
 <x-layouts.app.sidebar :title="$title ?? null">
-    <flux:main>
+    <flux:main id="main-content">
         {{ $slot }}
     </flux:main>
 </x-layouts.app.sidebar>
diff --git a/resources/views/components/layouts/app/sidebar.blade.php b/resources/views/components/layouts/app/sidebar.blade.php
index 1642a67..ab4bdf5 100644
--- a/resources/views/components/layouts/app/sidebar.blade.php
+++ b/resources/views/components/layouts/app/sidebar.blade.php
@@ -325,9 +325,7 @@
             </flux:dropdown>
         </flux:header>
 
-        <main id="main-content" role="main" tabindex="-1">
-            {{ $slot }}
-        </main>
+        {{ $slot }}
 
         @fluxScripts
     </body>
diff --git a/resources/views/livewire/admin/dashboard.blade.php b/resources/views/livewire/admin/dashboard.blade.php
index 779b4d5..496af58 100644
--- a/resources/views/livewire/admin/dashboard.blade.php
+++ b/resources/views/livewire/admin/dashboard.blade.php
@@ -386,7 +386,7 @@ new class extends Component
                             chart: null,
                             data: @js($chartData),
                             init() {
-                                if (typeof Chart === 'undefined') return;
+                                if (typeof Chart === 'undefined' || !this.$refs.canvas) return;
                                 this.chart = new Chart(this.$refs.canvas, {
                                     type: 'line',
                                     data: {
@@ -454,7 +454,7 @@ new class extends Component
                             chart: null,
                             data: @js($chartData['consultationBreakdown']),
                             init() {
-                                if (typeof Chart === 'undefined') return;
+                                if (typeof Chart === 'undefined' || !this.$refs.canvas) return;
                                 const total = this.data.free + this.data.paid;
                                 this.chart = new Chart(this.$refs.canvas, {
                                     type: 'doughnut',
@@ -515,7 +515,7 @@ new class extends Component
                             chart: null,
                             data: @js($chartData),
                             init() {
-                                if (typeof Chart === 'undefined') return;
+                                if (typeof Chart === 'undefined' || !this.$refs.canvas) return;
                                 this.chart = new Chart(this.$refs.canvas, {
                                     type: 'line',
                                     data: {