diff --git a/app/Filament/Pages/Settings/GeneralPage.php b/app/Filament/Pages/Settings/GeneralPage.php
index 526e021cf..88c81a8e3 100644
--- a/app/Filament/Pages/Settings/GeneralPage.php
+++ b/app/Filament/Pages/Settings/GeneralPage.php
@@ -102,6 +102,10 @@ public function form(Form $form): Form
 
     protected function getServerLabels(array $values): array
     {
+        if (count($values) && is_null($values[0])) {
+            return [];
+        }
+
         return collect($values)->mapWithKeys(function (string $item, int $key) {
             return [$item => $item];
         })->toArray();
@@ -129,7 +133,7 @@ protected function getServerSearchOptions(string $search): array
             return collect([
                 [
                     'id' => $search,
-                    'name' => 'Unknown server',
+                    'name' => $search.' (Manually entered server)',
                 ],
             ])->pluck('name', 'id')->toArray();
         }