diff --git a/app/Providers/Filament/AdminPanelProvider.php b/app/Providers/Filament/AdminPanelProvider.php
index 9c838eb02..5e5f3ef58 100644
--- a/app/Providers/Filament/AdminPanelProvider.php
+++ b/app/Providers/Filament/AdminPanelProvider.php
@@ -3,7 +3,6 @@
 namespace App\Providers\Filament;
 
 use AchyutN\FilamentLogViewer\FilamentLogViewer;
-use App\Facades\Plugins;
 use Filament\Actions\Action;
 use Filament\Facades\Filament;
 use Filament\Navigation\NavigationGroup;
@@ -13,7 +12,7 @@ class AdminPanelProvider extends PanelProvider
 {
     public function panel(Panel $panel): Panel
     {
-        $panel = parent::panel($panel)
+        return parent::panel($panel)
             ->id('admin')
             ->path('admin')
             ->homeUrl('/')
@@ -41,9 +40,5 @@ class AdminPanelProvider extends PanelProvider
                     ->navigationGroup(fn () => trans('admin/dashboard.advanced'))
                     ->navigationIcon('tabler-file-info'),
             ]);
-
-        Plugins::loadPanelPlugins($panel);
-
-        return $panel;
     }
 }
diff --git a/app/Providers/Filament/AppPanelProvider.php b/app/Providers/Filament/AppPanelProvider.php
index 15c582877..6907cebe5 100644
--- a/app/Providers/Filament/AppPanelProvider.php
+++ b/app/Providers/Filament/AppPanelProvider.php
@@ -3,7 +3,6 @@
 namespace App\Providers\Filament;
 
 use AchyutN\FilamentLogViewer\FilamentLogViewer;
-use App\Facades\Plugins;
 use Filament\Actions\Action;
 use Filament\Facades\Filament;
 use Filament\Panel;
@@ -12,7 +11,7 @@ class AppPanelProvider extends PanelProvider
 {
     public function panel(Panel $panel): Panel
     {
-        $panel = parent::panel($panel)
+        return parent::panel($panel)
             ->id('app')
             ->default()
             ->breadcrumbs(false)
@@ -30,9 +29,5 @@ class AppPanelProvider extends PanelProvider
                 FilamentLogViewer::make()
                     ->authorize(false),
             ]);
-
-        Plugins::loadPanelPlugins($panel);
-
-        return $panel;
     }
 }
diff --git a/app/Providers/Filament/PanelProvider.php b/app/Providers/Filament/PanelProvider.php
index cdb0dde42..ac8e9436a 100644
--- a/app/Providers/Filament/PanelProvider.php
+++ b/app/Providers/Filament/PanelProvider.php
@@ -3,6 +3,7 @@
 namespace App\Providers\Filament;
 
 use App\Enums\CustomizationKey;
+use App\Facades\Plugins;
 use App\Filament\Pages\Auth\EditProfile;
 use App\Filament\Pages\Auth\Login;
 use App\Http\Middleware\LanguageMiddleware;
@@ -27,7 +28,7 @@ abstract class PanelProvider extends BasePanelProvider
 {
     public function panel(Panel $panel): Panel
     {
-        return $panel
+        $panel
             ->spa()
             ->databaseNotifications()
             ->brandName(config('app.name', 'Pelican'))
@@ -94,5 +95,9 @@ abstract class PanelProvider extends BasePanelProvider
             ->authMiddleware([
                 Authenticate::class,
             ]);
+
+        Plugins::loadPanelPlugins($panel);
+
+        return $panel;
     }
 }
diff --git a/app/Providers/Filament/ServerPanelProvider.php b/app/Providers/Filament/ServerPanelProvider.php
index cb405b128..834928497 100644
--- a/app/Providers/Filament/ServerPanelProvider.php
+++ b/app/Providers/Filament/ServerPanelProvider.php
@@ -2,7 +2,6 @@
 
 namespace App\Providers\Filament;
 
-use App\Facades\Plugins;
 use App\Filament\Admin\Resources\Servers\Pages\EditServer;
 use App\Filament\App\Resources\Servers\Pages\ListServers;
 use App\Http\Middleware\Activity\ServerSubject;
@@ -15,7 +14,7 @@ class ServerPanelProvider extends PanelProvider
 {
     public function panel(Panel $panel): Panel
     {
-        $panel = parent::panel($panel)
+        return parent::panel($panel)
             ->id('server')
             ->path('server')
             ->homeUrl(fn () => Filament::getPanel('app')->getUrl())
@@ -44,9 +43,5 @@ class ServerPanelProvider extends PanelProvider
             ->tenantMiddleware([
                 ServerSubject::class,
             ]);
-
-        Plugins::loadPanelPlugins($panel);
-
-        return $panel;
     }
 }