diff --git a/app/Http/Middleware/Activity/ServerSubject.php b/app/Http/Middleware/Activity/ServerSubject.php
index 4a806f348..b4ff96634 100644
--- a/app/Http/Middleware/Activity/ServerSubject.php
+++ b/app/Http/Middleware/Activity/ServerSubject.php
@@ -5,6 +5,7 @@ namespace App\Http\Middleware\Activity;
 use App\Facades\LogTarget;
 use App\Models\Server;
 use Closure;
+use Filament\Facades\Filament;
 use Illuminate\Http\Request;
 use Symfony\Component\HttpFoundation\Response;
 
@@ -21,10 +22,7 @@ class ServerSubject
     public function handle(Request $request, Closure $next): Response
     {
         $server = $request->route()->parameter('server');
-
-        if ($request->route()->hasParameter('tenant')) {
-            $server = Server::find($request->route()->parameter('tenant'));
-        }
+        $server ??= Filament::getTenant();
 
         if ($server instanceof Server) {
             LogTarget::setActor($request->user());
diff --git a/app/Providers/Filament/ServerPanelProvider.php b/app/Providers/Filament/ServerPanelProvider.php
index 25221e89c..8d7f6f6eb 100644
--- a/app/Providers/Filament/ServerPanelProvider.php
+++ b/app/Providers/Filament/ServerPanelProvider.php
@@ -41,7 +41,7 @@ class ServerPanelProvider extends PanelProvider
             ->discoverResources(in: app_path('Filament/Server/Resources'), for: 'App\\Filament\\Server\\Resources')
             ->discoverPages(in: app_path('Filament/Server/Pages'), for: 'App\\Filament\\Server\\Pages')
             ->discoverWidgets(in: app_path('Filament/Server/Widgets'), for: 'App\\Filament\\Server\\Widgets')
-            ->middleware([
+            ->tenantMiddleware([
                 ServerSubject::class,
             ]);
     }