diff --git a/src/Filament/Clusters/System.php b/src/Filament/Clusters/System.php
index c40f612..03ef54e 100644
--- a/src/Filament/Clusters/System.php
+++ b/src/Filament/Clusters/System.php
@@ -14,16 +14,6 @@ public static function getNavigationLabel(): string
         return __('app.System_cluster');
     }
 
-    public function getTitle(): string | Htmlable
-    {
-        return __('app.System_cluster');
-    }
-
-    public function getHeading(): string | Htmlable
-    {
-        return __('app.System_cluster');
-    }
-
     public static function getClusterBreadcrumb(): ?string
     {
         return __('app.System_cluster');
diff --git a/src/Models/Company.php b/src/Models/Company.php
index 98a2264..77e40a3 100644
--- a/src/Models/Company.php
+++ b/src/Models/Company.php
@@ -30,6 +30,11 @@ class Company extends Model implements HasAvatar, HasCurrentTenantLabel, HasName
     use CompanyRelations;
     use HasTranslations;
 
+    public function getTenantId(): ?string
+    {
+        return auth()->user()?->company_id;
+    }
+
     public array $translatable = ['name'];
 
     public function saveCompanySettings(array $data): void