diff --git a/app/Filament/Server/Pages/Startup.php b/app/Filament/Server/Pages/Startup.php
index 4aa8dd0de..1d592f95c 100644
--- a/app/Filament/Server/Pages/Startup.php
+++ b/app/Filament/Server/Pages/Startup.php
@@ -153,7 +153,7 @@ class Startup extends ServerFormPage
 
     public static function canAccess(): bool
     {
-        return auth()->user()->can(Permission::ACTION_STARTUP_READ, Filament::getTenant());
+        return parent::canAccess() && auth()->user()->can(Permission::ACTION_STARTUP_READ, Filament::getTenant());
     }
 
     private function shouldHideComponent(ServerVariable $serverVariable, Component $component): bool
diff --git a/app/Filament/Server/Resources/ActivityResource.php b/app/Filament/Server/Resources/ActivityResource.php
index 30a219544..2565c3285 100644
--- a/app/Filament/Server/Resources/ActivityResource.php
+++ b/app/Filament/Server/Resources/ActivityResource.php
@@ -52,19 +52,6 @@ class ActivityResource extends Resource
             });
     }
 
-    // TODO: find better way handle server conflict state
-    public static function canAccess(): bool
-    {
-        /** @var Server $server */
-        $server = Filament::getTenant();
-
-        if ($server->isInConflictState()) {
-            return false;
-        }
-
-        return parent::canAccess();
-    }
-
     public static function canViewAny(): bool
     {
         return auth()->user()->can(Permission::ACTION_ACTIVITY_READ, Filament::getTenant());