diff --git a/app/Filament/Server/Pages/Settings.php b/app/Filament/Server/Pages/Settings.php
index 8158d66d0..a95ddd25c 100644
--- a/app/Filament/Server/Pages/Settings.php
+++ b/app/Filament/Server/Pages/Settings.php
@@ -83,8 +83,8 @@ class Settings extends ServerFormPage
                                         'lg' => 4,
                                     ])
                                     ->disabled(),
-                                TextInput::make('id')
-                                    ->label(trans('server/setting.server_info.id'))
+                                TextInput::make('uuid_short')
+                                    ->label(trans('server/setting.server_info.uuid_short'))
                                     ->disabled()
                                     ->columnSpan(1),
                                 TextInput::make('node.name')
diff --git a/app/Models/Server.php b/app/Models/Server.php
index 32300a96e..f3f3c0e00 100644
--- a/app/Models/Server.php
+++ b/app/Models/Server.php
@@ -381,7 +381,7 @@ class Server extends Model implements Validatable
     public function resolveRouteBinding($value, $field = null): ?self
     {
         return match ($field) {
-            'uuid' => $this->where('uuid_short', $value)->orWhere('uuid', $value)->firstOrFail(),
+            'uuid', 'uuid_short' => $this->where('uuid_short', $value)->orWhere('uuid', $value)->firstOrFail(),
             default => $this->where('id', $value)->firstOrFail(),
         };
     }
diff --git a/app/Providers/Filament/ServerPanelProvider.php b/app/Providers/Filament/ServerPanelProvider.php
index 2f9c629b8..67d285fcf 100644
--- a/app/Providers/Filament/ServerPanelProvider.php
+++ b/app/Providers/Filament/ServerPanelProvider.php
@@ -19,7 +19,7 @@ class ServerPanelProvider extends PanelProvider
             ->id('server')
             ->path('server')
             ->homeUrl(fn () => Filament::getPanel('app')->getUrl())
-            ->tenant(Server::class)
+            ->tenant(Server::class, 'uuid_short')
             ->userMenuItems([
                 Action::make('to_serverList')
                     ->label(trans('profile.server_list'))
diff --git a/lang/en/server/setting.php b/lang/en/server/setting.php
index 19d1796fd..c8ee66d57 100644
--- a/lang/en/server/setting.php
+++ b/lang/en/server/setting.php
@@ -12,7 +12,7 @@ return [
         'notification_description' => 'Updated Server Description',
         'failed' => 'Failed',
         'uuid' => 'Server UUID',
-        'id' => 'Server ID',
+        'uuid_short' => 'Server ID',
         'node_name' => 'Node Name',
         'limits' => [
             'title' => 'Limits',