diff --git a/CHANGELOG.md b/CHANGELOG.md
index cb13e87585..380e149d92 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Guests can now choose to remember their name for future video conferences ([#2450], [#3275])
 - Room access is now preserved across page reloads after entering via an access code or personalized link ([#3275])
 - Login button inside room access overlay to allow users to log in instead of accessing the room as a guest ([#2450], [#3275])
+- Option to set connection status of servers to always online ([#3317], [#3373])
 
 ### Changed
 
@@ -25,6 +26,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Guest name input was moved from join dialog to room access overlay ([#2450], [#3275])
 - Room share link now includes the access code, so users no longer need to enter it manually when opening the link ([#3275])
 - Improved fallback behavior for invalid room and user tab links ([#3275])
+- Prometheus metric label `pilos_servers_total{status="unhealthy"}` to `pilos_servers_total{status="faulty"}` ([#3373])
+- Connection status terminology in log messages (`unhealthy` to `faulty`; `healthy` to `online`; `old_health` to `old_connection_status`) ([#3373])
 
 ### Fixed
 
@@ -896,6 +899,8 @@ You can find the changelog for older versions there [here](https://github.com/TH
 [#3314]: https://github.com/THM-Health/PILOS/issues/3314
 [#3315]: https://github.com/THM-Health/PILOS/pull/3315
 [#3316]: https://github.com/THM-Health/PILOS/pull/3316
+[#3317]: https://github.com/THM-Health/PILOS/issues/3317
+[#3373]: https://github.com/THM-Health/PILOS/pull/3373
 [unreleased]: https://github.com/THM-Health/PILOS/compare/v4.17.0...develop
 [v3.0.0]: https://github.com/THM-Health/PILOS/releases/tag/v3.0.0
 [v3.0.1]: https://github.com/THM-Health/PILOS/releases/tag/v3.0.1
diff --git a/app/Enums/ServerHealth.php b/app/Enums/ServerConnectionStatus.php
similarity index 51%
rename from app/Enums/ServerHealth.php
rename to app/Enums/ServerConnectionStatus.php
index 25eb470f2b..f7b3c3595f 100644
--- a/app/Enums/ServerHealth.php
+++ b/app/Enums/ServerConnectionStatus.php
@@ -4,12 +4,9 @@
 
 namespace App\Enums;
 
-/**
- * Custom status response codes of the api
- */
-enum ServerHealth: int
+enum ServerConnectionStatus: int
 {
     case ONLINE = 1;
-    case UNHEALTHY = 0;
+    case FAULTY = 0;
     case OFFLINE = -1;
 }
diff --git a/app/Enums/ServerStatus.php b/app/Enums/ServerStatus.php
index 63b29a3e31..36301c493a 100644
--- a/app/Enums/ServerStatus.php
+++ b/app/Enums/ServerStatus.php
@@ -4,9 +4,6 @@
 
 namespace App\Enums;
 
-/**
- * Custom status response codes of the api
- */
 enum ServerStatus: int
 {
     case DISABLED = -1;
diff --git a/app/Http/Controllers/api/v1/ServerController.php b/app/Http/Controllers/api/v1/ServerController.php
index cca7440057..fff01117be 100644
--- a/app/Http/Controllers/api/v1/ServerController.php
+++ b/app/Http/Controllers/api/v1/ServerController.php
@@ -107,11 +107,12 @@ public function update(ServerRequest $request, Server $server)
         $server->secret = $request->secret;
         $server->strength = $request->strength;
         $server->status = $request->status;
+        $server->connection_status_always_online = $request->boolean('connection_status_always_online');
 
         $server->error_count = 0;
         $server->recover_count = config('bigbluebutton.server_online_threshold');
 
-        // Check if server is online/offline and update usage data
+        // Update server usage, load data and connection status
         $serverService = new ServerService($server);
         $serverService->updateUsage();
 
@@ -134,6 +135,7 @@ public function store(ServerRequest $request)
         $server->secret = $request->secret;
         $server->strength = $request->strength;
         $server->status = $request->status;
+        $server->connection_status_always_online = $request->boolean('connection_status_always_online');
 
         $server->error_count = 0;
         $server->recover_count = config('bigbluebutton.server_online_threshold');
diff --git a/app/Http/Requests/ServerRequest.php b/app/Http/Requests/ServerRequest.php
index d4361b65ee..dc0fe18ac0 100644
--- a/app/Http/Requests/ServerRequest.php
+++ b/app/Http/Requests/ServerRequest.php
@@ -19,6 +19,7 @@ public function rules()
             'secret' => ['required', 'string', 'max:255'],
             'strength' => ['required', 'integer', 'min:1', 'max:10'],
             'status' => ['required', Rule::enum(ServerStatus::class)],
+            'connection_status_always_online' => ['required', 'boolean'],
         ];
 
         if ($this->route('server')) {
diff --git a/app/Http/Resources/ServerResource.php b/app/Http/Resources/ServerResource.php
index b511826301..4454e7fd98 100644
--- a/app/Http/Resources/ServerResource.php
+++ b/app/Http/Resources/ServerResource.php
@@ -41,8 +41,9 @@ public function toArray($request)
             'name' => $this->name,
             'description' => $this->description,
             'strength' => $this->strength,
+            'connection_status_always_online' => $this->connection_status_always_online,
             'status' => $this->status,
-            'health' => $this->health,
+            'connection_status' => $this->connection_status,
             'participant_count' => $this->participant_count,
             'listener_count' => $this->listener_count,
             'voice_participant_count' => $this->voice_participant_count,
diff --git a/app/Models/Server.php b/app/Models/Server.php
index 2078e67769..2a6ddb7694 100644
--- a/app/Models/Server.php
+++ b/app/Models/Server.php
@@ -4,7 +4,7 @@
 
 namespace App\Models;
 
-use App\Enums\ServerHealth;
+use App\Enums\ServerConnectionStatus;
 use App\Enums\ServerStatus;
 use App\Observers\ServerObserver;
 use App\Traits\AddsModelNameTrait;
@@ -22,6 +22,7 @@ class Server extends Model
 
     protected $casts = [
         'strength' => 'integer',
+        'connection_status_always_online' => 'boolean',
         'status' => ServerStatus::class,
         'participant_count' => 'integer',
         'listener_count' => 'integer',
@@ -78,24 +79,30 @@ public function getLogLabel()
         return $this->name.' ('.$this->id.')';
     }
 
-    public function getHealthAttribute(): ?ServerHealth
+    public function getConnectionStatusAttribute(): ?ServerConnectionStatus
     {
+        // No connection status available for disabled servers
         if ($this->status == ServerStatus::DISABLED) {
             return null;
         }
 
-        return self::calcHealth($this->recover_count, $this->error_count);
+        // Always return online if connection_status_always_online
+        if ($this->connection_status_always_online) {
+            return ServerConnectionStatus::ONLINE;
+        }
+
+        return self::calculateConnectionStatus($this->recover_count, $this->error_count);
     }
 
-    public static function calcHealth(int $recover_count, int $error_count): ServerHealth
+    public static function calculateConnectionStatus(int $recover_count, int $error_count): ServerConnectionStatus
     {
         if ($recover_count >= config('bigbluebutton.server_online_threshold')) {
-            return ServerHealth::ONLINE;
+            return ServerConnectionStatus::ONLINE;
         }
         if ($error_count >= config('bigbluebutton.server_offline_threshold')) {
-            return ServerHealth::OFFLINE;
+            return ServerConnectionStatus::OFFLINE;
         }
 
-        return ServerHealth::UNHEALTHY;
+        return ServerConnectionStatus::FAULTY;
     }
 }
diff --git a/app/Models/ServerPool.php b/app/Models/ServerPool.php
index 79b790a884..2cb912d988 100644
--- a/app/Models/ServerPool.php
+++ b/app/Models/ServerPool.php
@@ -21,7 +21,7 @@ class ServerPool extends Model
     protected $fillable = ['name', 'description'];
 
     /**
-     * Servers that are port of this server pool
+     * Servers that are part of this server pool
      */
     public function servers(): BelongsToMany
     {
diff --git a/app/Observers/ServerObserver.php b/app/Observers/ServerObserver.php
index 4ef07782ad..6fa1ddbcea 100644
--- a/app/Observers/ServerObserver.php
+++ b/app/Observers/ServerObserver.php
@@ -4,7 +4,7 @@
 
 namespace App\Observers;
 
-use App\Enums\ServerHealth;
+use App\Enums\ServerConnectionStatus;
 use App\Enums\ServerStatus;
 use App\Models\Server;
 use Illuminate\Support\Facades\Log;
@@ -54,28 +54,28 @@ public function updated(Server $server): void
             ]);
         }
 
-        // Check if server health changed
-        $newHealth = Server::calcHealth($server->recover_count, $server->error_count);
-        $previousHealth = Server::calcHealth($server->getOriginal('recover_count'), $server->getOriginal('error_count'));
-        if ($newHealth != $previousHealth) {
-            if ($newHealth == ServerHealth::OFFLINE) {
-                Log::error('Server {server} health changed to offline', [
+        // Check if server connection status changed
+        $newConnectionStatus = Server::calculateConnectionStatus($server->recover_count, $server->error_count);
+        $previousConnectionStatus = Server::calculateConnectionStatus($server->getOriginal('recover_count'), $server->getOriginal('error_count'));
+        if ($newConnectionStatus != $previousConnectionStatus) {
+            if ($newConnectionStatus == ServerConnectionStatus::OFFLINE) {
+                Log::error('Server {server} changed to offline', [
                     'server' => $server->getLogLabel(),
-                    'old_health' => $previousHealth->name,
+                    'old_connection_status' => $previousConnectionStatus->name,
                 ]);
             }
 
-            if ($newHealth == ServerHealth::UNHEALTHY) {
-                Log::warning('Server {server} health changed to unhealthy', [
+            if ($newConnectionStatus == ServerConnectionStatus::FAULTY) {
+                Log::warning('Server {server} changed to faulty', [
                     'server' => $server->getLogLabel(),
-                    'old_health' => $previousHealth->name,
+                    'old_connection_status' => $previousConnectionStatus->name,
                 ]);
             }
 
-            if ($newHealth == ServerHealth::ONLINE) {
-                Log::notice('Server {server} health changed to healthy', [
+            if ($newConnectionStatus == ServerConnectionStatus::ONLINE) {
+                Log::notice('Server {server} changed to online', [
                     'server' => $server->getLogLabel(),
-                    'old_health' => $previousHealth->name,
+                    'old_connection_status' => $previousConnectionStatus->name,
                 ]);
             }
         }
diff --git a/app/Prometheus/Collectors/ServerCollector.php b/app/Prometheus/Collectors/ServerCollector.php
index c0469ad50e..de615dd3a9 100644
--- a/app/Prometheus/Collectors/ServerCollector.php
+++ b/app/Prometheus/Collectors/ServerCollector.php
@@ -30,6 +30,6 @@ public function collect(): void
             ->set(Server::where('status', ServerStatus::ENABLED)
                 ->where('recover_count', '<', config('bigbluebutton.server_online_threshold'))
                 ->where('error_count', '<', config('bigbluebutton.server_offline_threshold'))
-                ->count(), ['unhealthy']);
+                ->count(), ['faulty']);
     }
 }
diff --git a/app/Services/LoadBalancingService.php b/app/Services/LoadBalancingService.php
index 62b4025d70..4a6e98369d 100644
--- a/app/Services/LoadBalancingService.php
+++ b/app/Services/LoadBalancingService.php
@@ -7,14 +7,15 @@
 use App\Enums\ServerStatus;
 use App\Models\Server;
 use App\Models\ServerPool;
+use Illuminate\Database\Eloquent\Builder;
 
 class LoadBalancingService
 {
-    private $servers;
+    private ServerPool $serverPool;
 
     public function setServerPool(ServerPool $serverPool)
     {
-        $this->servers = $serverPool->servers;
+        $this->serverPool = $serverPool;
 
         return $this;
     }
@@ -24,14 +25,16 @@ public function setServerPool(ServerPool $serverPool)
      */
     public function getLowestUsageServer(): ?Server
     {
-        return $this->servers
+        return $this->serverPool->servers()
             ->where('status', ServerStatus::ENABLED)
-            ->where('recover_count', '>=', config('bigbluebutton.server_online_threshold'))
-            ->where('error_count', '=', 0)
-            ->whereNotNull('load')
-            ->sortBy(function (Server $server) {
-                return $server->load / $server->strength;
+            ->where(function (Builder $query) {
+                $query->where('recover_count', '>=', config('bigbluebutton.server_online_threshold'))
+                    ->where('error_count', '=', 0)
+                    ->orWhere('connection_status_always_online', true);
             })
+            ->whereNotNull('load')
+            ->where('strength', '>', 0) // Extra safety against division by zero; request validation ensures strength is between 1 and 10
+            ->orderByRaw('`load` / `strength`')
             ->first();
     }
 }
diff --git a/app/Services/ServerService.php b/app/Services/ServerService.php
index 281bdd6bda..d69e5c1684 100644
--- a/app/Services/ServerService.php
+++ b/app/Services/ServerService.php
@@ -4,7 +4,7 @@
 
 namespace App\Services;
 
-use App\Enums\ServerHealth;
+use App\Enums\ServerConnectionStatus;
 use App\Enums\ServerStatus;
 use App\Models\Meeting;
 use App\Models\MeetingStat;
@@ -87,7 +87,11 @@ private function getBBBVersion(): ?string
      */
     public function handleApiCallFailed()
     {
-        if ($this->server->health != ServerHealth::OFFLINE) {
+        if ($this->server->connection_status_always_online) {
+            return;
+        }
+
+        if ($this->server->connection_status != ServerConnectionStatus::OFFLINE) {
             $this->server->error_count++;
         }
 
@@ -96,23 +100,25 @@ public function handleApiCallFailed()
         $this->server->timestamps = false;
         $this->server->save();
 
-        if ($this->server->health == ServerHealth::OFFLINE) {
+        if ($this->server->connection_status == ServerConnectionStatus::OFFLINE) {
             $this->setMeetingsDetached();
         }
     }
 
     public function handleApiCallSuccessful()
     {
-        if ($this->server->health != ServerHealth::ONLINE) {
-            $this->server->recover_count++;
-        }
+        if (! $this->server->connection_status_always_online) {
+            if ($this->server->connection_status != ServerConnectionStatus::ONLINE) {
+                $this->server->recover_count++;
+            }
 
-        if ($this->server->health == ServerHealth::ONLINE) {
-            $this->server->error_count = 0;
-        }
+            if ($this->server->connection_status == ServerConnectionStatus::ONLINE) {
+                $this->server->error_count = 0;
+            }
 
-        $this->server->timestamps = false;
-        $this->server->save();
+            $this->server->timestamps = false;
+            $this->server->save();
+        }
 
         $this->endDetachedMeetings();
 
@@ -206,7 +212,7 @@ public function updateUsage($updateServerStatistics = false, $updateMeetingStati
                 $this->server->stats()->save($serverStat);
             }
 
-            if ($this->server->health == ServerHealth::OFFLINE) {
+            if ($this->server->connection_status == ServerConnectionStatus::OFFLINE) {
                 // Clear current live server status
                 $this->server->participant_count = null;
                 $this->server->listener_count = null;
diff --git a/database/factories/ServerFactory.php b/database/factories/ServerFactory.php
index a250715ae2..fbfb3b751e 100644
--- a/database/factories/ServerFactory.php
+++ b/database/factories/ServerFactory.php
@@ -34,6 +34,7 @@ public function definition()
             'version' => '2.4.5',
             'strength' => 1,
             'load' => 0,
+            'connection_status_always_online' => false,
         ];
     }
 }
diff --git a/database/migrations/2026_07_17_000000_add_connection_status_always_online_to_servers_table.php b/database/migrations/2026_07_17_000000_add_connection_status_always_online_to_servers_table.php
new file mode 100644
index 0000000000..e0360a63ad
--- /dev/null
+++ b/database/migrations/2026_07_17_000000_add_connection_status_always_online_to_servers_table.php
@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('servers', function (Blueprint $table) {
+            $table->boolean('connection_status_always_online')->default(false)->after('strength');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('servers', function (Blueprint $table) {
+            $table->dropColumn('connection_status_always_online');
+        });
+    }
+};
diff --git a/database/migrations/migrate-to-v4/2024_03_06_152142_add_health_counters_to_servers_table.php b/database/migrations/migrate-to-v4/2024_03_06_152142_add_health_counters_to_servers_table.php
index 4a6eb2c198..e8ecb4a22a 100644
--- a/database/migrations/migrate-to-v4/2024_03_06_152142_add_health_counters_to_servers_table.php
+++ b/database/migrations/migrate-to-v4/2024_03_06_152142_add_health_counters_to_servers_table.php
@@ -20,24 +20,21 @@ public function up(): void
             $table->integer('recover_count')->default(0);
         });
 
-        // Migrate the status column to health counters and status
+        // Migrate the status column to connection status counters and status
         foreach (Server::all() as $server) {
 
             switch ($server->getRawOriginal('status')) {
-                // Disabled
-                case -1:
+                case -1: // Disabled
                     $server->status = ServerStatus::DISABLED;
                     break;
-                    // Offline
-                case 0:
-                    // Server is unhealthy, but not offline yet
+                case 0: // Offline
+                    // Server is faulty, but not offline yet
                     $server->recover_count = 0;
                     $server->error_count = 0;
                     $server->status = ServerStatus::ENABLED;
                     break;
-                    // Online
-                case 1:
-                    // Server is healthy
+                case 1: // Online
+                    // Server is online
                     $server->recover_count = config('bigbluebutton.server_online_threshold');
                     $server->error_count = 0;
                     $server->status = ServerStatus::ENABLED;
diff --git a/docs/static/grafana-dashboard.json b/docs/static/grafana-dashboard.json
index b463e12e81..56761c5d8f 100644
--- a/docs/static/grafana-dashboard.json
+++ b/docs/static/grafana-dashboard.json
@@ -604,7 +604,7 @@
           {
             "matcher": {
               "id": "byName",
-              "options": "pilos_servers_total{instance=\"app:80\", job=\"prometheus\", status=\"unhealthy\"}"
+              "options": "pilos_servers_total{instance=\"app:80\", job=\"prometheus\", status=\"faulty\"}"
             },
             "properties": [
               {
@@ -713,12 +713,12 @@
           },
           "disableTextWrap": false,
           "editorMode": "builder",
-          "expr": "pilos_servers_total{status=\"unhealthy\"}",
+          "expr": "pilos_servers_total{status=\"faulty\"}",
           "fullMetaSearch": false,
           "hide": false,
           "includeNullMetadata": true,
           "range": true,
-          "refId": "Unhealthy",
+          "refId": "Faulty",
           "useBackend": false
         }
       ],
diff --git a/lang/en/admin.php b/lang/en/admin.php
index 050301112b..0ce867b3e7 100644
--- a/lang/en/admin.php
+++ b/lang/en/admin.php
@@ -213,6 +213,7 @@
         'view' => 'Detailed information for the server pool :name',
     ],
     'servers' => [
+        'always_online' => 'Always online',
         'base_url' => 'API endpoint',
         'connection' => 'Connection',
         'current_usage' => 'Current usage',
@@ -226,6 +227,7 @@
         'draining' => 'Draining',
         'edit' => 'Edit server :name',
         'enabled' => 'Enabled',
+        'faulty' => 'Faulty',
         'flash' => [
             'panic' => [
                 'description_meetings_successful' => '{0} No meetings were successfully stopped. |{1} 1 meeting was successfully stopped. |[2,*] :count meetings were successfully stopped.',
@@ -259,9 +261,10 @@
         'status' => 'Status',
         'strength' => 'Server strength',
         'strength_description' => 'Load balancing factor; the higher the factor, the more participants and meetings the server can handle',
+        'connection_status_always_online' => 'Connection always online',
+        'connection_status_always_online_description' => 'The server is always considered online and available for new meetings; connection issues are ignored',
         'test_connection' => 'Test connection',
         'tile_description' => 'The servers provide the BBB infrastructure for the meetings.',
-        'unhealthy' => 'Faulty',
         'unknown' => 'Unknown',
         'usage_info' => 'The usage (meetings, participants, videos) also contains meetings that are managed by other systems.',
         'version' => 'Version',
diff --git a/resources/js/views/AdminServersIndex.vue b/resources/js/views/AdminServersIndex.vue
index 37c1efd9b0..dd52d008e7 100644
--- a/resources/js/views/AdminServersIndex.vue
+++ b/resources/js/views/AdminServersIndex.vue
@@ -146,10 +146,13 @@
           />
         </template>
       </Column>
-      <Column :header="$t('admin.servers.connection')" field="health">
+      <Column
+        :header="$t('admin.servers.connection')"
+        field="connection_status"
+      >
         <template #body="slotProps">
           <Tag
-            v-if="slotProps.data.health === -1"
+            v-if="slotProps.data.connection_status === -1"
             v-tooltip="$t('admin.servers.offline')"
             :aria-label="$t('admin.servers.offline')"
             class="p-2"
@@ -157,15 +160,33 @@
             icon="fa-solid fa-xmark"
           />
           <Tag
-            v-else-if="slotProps.data.health === 0"
-            v-tooltip="$t('admin.servers.unhealthy')"
-            :aria-label="$t('admin.servers.unhealthy')"
+            v-else-if="slotProps.data.connection_status === 0"
+            v-tooltip="$t('admin.servers.faulty')"
+            :aria-label="$t('admin.servers.faulty')"
             class="p-2"
             severity="warning"
             icon="fa-solid fa-triangle-exclamation"
           />
           <Tag
-            v-else-if="slotProps.data.health === 1"
+            v-else-if="
+              slotProps.data.connection_status === 1 &&
+              slotProps.data.connection_status_always_online
+            "
+            v-tooltip="$t('admin.servers.always_online')"
+            :aria-label="$t('admin.servers.always_online')"
+            class="relative gap-0 p-2"
+            severity="success"
+          >
+            <span class="absolute left-1 font-medium"
+              ><raw-text>(</raw-text></span
+            >
+            <i class="p-tag-icon fa-solid fa-check"></i>
+            <span class="absolute right-1 font-medium"
+              ><raw-text>)</raw-text></span
+            >
+          </Tag>
+          <Tag
+            v-else-if="slotProps.data.connection_status === 1"
             v-tooltip="$t('admin.servers.online')"
             :aria-label="$t('admin.servers.online')"
             class="p-2"
diff --git a/resources/js/views/AdminServersView.vue b/resources/js/views/AdminServersView.vue
index 0d458cc1a6..b3d4da1b2d 100644
--- a/resources/js/views/AdminServersView.vue
+++ b/resources/js/views/AdminServersView.vue
@@ -200,16 +200,48 @@
 
         <div
           class="field grid grid-cols-12 gap-4"
-          data-test="health-status-field"
+          data-test="connection-status-always-online-field"
         >
-          <label class="col-span-12 md:col-span-4 md:mb-0" for="healthStatus">{{
-            $t("admin.servers.connection")
-          }}</label>
+          <label
+            for="connection-status-always-online"
+            class="col-span-12 items-start md:col-span-4 md:mb-0"
+            >{{ $t("admin.servers.connection_status_always_online") }}</label
+          >
+          <div class="col-span-12 md:col-span-8">
+            <div>
+              <ToggleSwitch
+                v-model="model.connection_status_always_online"
+                input-id="connection-status-always-online"
+                :invalid="
+                  formErrors.fieldInvalid('connection_status_always_online')
+                "
+                :disabled="isBusy || modelLoadingError || viewOnly"
+                aria-describedby="connection-status-always-online-help"
+              />
+            </div>
+            <FormError
+              :errors="formErrors.fieldError('connection_status_always_online')"
+            />
+            <small id="connection-status-always-online-help">{{
+              $t("admin.servers.connection_status_always_online_description")
+            }}</small>
+          </div>
+        </div>
+
+        <div
+          class="field grid grid-cols-12 gap-4"
+          data-test="connection-status-field"
+        >
+          <label
+            class="col-span-12 md:col-span-4 md:mb-0"
+            for="connectionStatus"
+            >{{ $t("admin.servers.connection") }}</label
+          >
           <div class="col-span-12 md:col-span-8">
             <InputGroup>
               <InputText
-                id="healthStatus"
-                v-model="healthStatus"
+                id="connectionStatus"
+                v-model="connectionStatusLabel"
                 :disabled="true"
                 type="text"
               />
@@ -422,6 +454,7 @@ const props = defineProps({
 
 const model = ref({
   id: null,
+  connection_status_always_online: false,
 });
 const name = ref("");
 
@@ -438,16 +471,16 @@ const isBusy = ref(false);
 const modelLoadingError = ref(false);
 const checking = ref(false);
 const panicking = ref(false);
-const health = ref(null);
+const connectionStatus = ref(null);
 const isDisabled = ref(false);
 const offlineReason = ref(null);
 
-const healthStatus = computed(() => {
-  switch (health.value) {
+const connectionStatusLabel = computed(() => {
+  switch (connectionStatus.value) {
     case -1:
       return t("admin.servers.offline");
     case 0:
-      return t("admin.servers.unhealthy");
+      return t("admin.servers.faulty");
     case 1:
       return t("admin.servers.online");
     default:
@@ -522,20 +555,20 @@ function testConnection() {
     .call("servers/check", config)
     .then((response) => {
       if (response.data.connection_ok && response.data.secret_ok) {
-        health.value = 1;
+        connectionStatus.value = 1;
         offlineReason.value = null;
       } else {
         if (response.data.connection_ok && !response.data.secret_ok) {
-          health.value = -1;
+          connectionStatus.value = -1;
           offlineReason.value = "secret";
         } else {
-          health.value = -1;
+          connectionStatus.value = -1;
           offlineReason.value = "connection";
         }
       }
     })
     .catch((error) => {
-      health.value = null;
+      connectionStatus.value = null;
       offlineReason.value = null;
 
       api.error(error);
@@ -560,7 +593,7 @@ function load() {
         model.value = response.data.data;
         isDisabled.value = model.value.status === -1;
         name.value = response.data.data.name;
-        health.value = model.value.health;
+        connectionStatus.value = model.value.connection_status;
         offlineReason.value = null;
       })
       .catch((error) => {
@@ -644,7 +677,7 @@ function handleStaleError(staleError) {
     reject: () => {
       model.value = staleError.new_model;
       name.value = staleError.new_model.name;
-      health.value = model.value.health;
+      connectionStatus.value = model.value.connection_status;
       offlineReason.value = null;
     },
   });
diff --git a/tests/Backend/Feature/MetricsTest.php b/tests/Backend/Feature/MetricsTest.php
index eeb9e1c95b..6c583ba149 100644
--- a/tests/Backend/Feature/MetricsTest.php
+++ b/tests/Backend/Feature/MetricsTest.php
@@ -209,14 +209,14 @@ public function test_server_gauge_metrics()
 
         $disabled = Server::factory()->count(10)->create(['status' => ServerStatus::DISABLED]);
         $draining = Server::factory()->count(20)->create(['status' => ServerStatus::DRAINING]);
-        $unhealthy = Server::factory()->count(30)->create(['status' => ServerStatus::ENABLED, 'recover_count' => 1, 'error_count' => 1]);
+        $faulty = Server::factory()->count(30)->create(['status' => ServerStatus::ENABLED, 'recover_count' => 1, 'error_count' => 1]);
         $offline = Server::factory()->count(40)->create(['status' => ServerStatus::ENABLED, 'recover_count' => 0, 'error_count' => 3]);
         $online = Server::factory()->count(50)->create(['status' => ServerStatus::ENABLED, 'recover_count' => 3, 'error_count' => 0]);
 
         $metrics = $this->getMetrics();
         $this->assertEquals(10, $metrics['pilos_servers_total{status="disabled"}']);
         $this->assertEquals(20, $metrics['pilos_servers_total{status="draining"}']);
-        $this->assertEquals(30, $metrics['pilos_servers_total{status="unhealthy"}']);
+        $this->assertEquals(30, $metrics['pilos_servers_total{status="faulty"}']);
         $this->assertEquals(40, $metrics['pilos_servers_total{status="offline"}']);
         $this->assertEquals(50, $metrics['pilos_servers_total{status="online"}']);
 
@@ -224,7 +224,7 @@ public function test_server_gauge_metrics()
         $metrics = $this->getMetrics();
         $this->assertEquals(10, $metrics['pilos_servers_total{status="disabled"}']);
         $this->assertEquals(20, $metrics['pilos_servers_total{status="draining"}']);
-        $this->assertEquals(30, $metrics['pilos_servers_total{status="unhealthy"}']);
+        $this->assertEquals(30, $metrics['pilos_servers_total{status="faulty"}']);
         $this->assertEquals(40, $metrics['pilos_servers_total{status="offline"}']);
         $this->assertEquals(50, $metrics['pilos_servers_total{status="online"}']);
 
@@ -235,9 +235,9 @@ public function test_server_gauge_metrics()
         $draining[0]->status = ServerStatus::ENABLED;
         $draining[0]->save();
 
-        $unhealthy[0]->error_count = 0;
-        $unhealthy[0]->recover_count = 3;
-        $unhealthy[0]->save();
+        $faulty[0]->error_count = 0;
+        $faulty[0]->recover_count = 3;
+        $faulty[0]->save();
 
         $offline[0]->error_count = 0;
         $offline[0]->recover_count = 3;
@@ -251,7 +251,7 @@ public function test_server_gauge_metrics()
         $metrics = $this->getMetrics();
         $this->assertEquals(9, $metrics['pilos_servers_total{status="disabled"}']);
         $this->assertEquals(19, $metrics['pilos_servers_total{status="draining"}']);
-        $this->assertEquals(29, $metrics['pilos_servers_total{status="unhealthy"}']);
+        $this->assertEquals(29, $metrics['pilos_servers_total{status="faulty"}']);
         $this->assertEquals(39, $metrics['pilos_servers_total{status="offline"}']);
         $this->assertEquals(53, $metrics['pilos_servers_total{status="online"}']);
     }
diff --git a/tests/Backend/Feature/api/v1/Room/RoomTest.php b/tests/Backend/Feature/api/v1/Room/RoomTest.php
index dfcccd16e0..d6149d455b 100644
--- a/tests/Backend/Feature/api/v1/Room/RoomTest.php
+++ b/tests/Backend/Feature/api/v1/Room/RoomTest.php
@@ -10,7 +10,7 @@
 use App\Enums\RoomLobby;
 use App\Enums\RoomUserRole;
 use App\Enums\RoomVisibility;
-use App\Enums\ServerHealth;
+use App\Enums\ServerConnectionStatus;
 use App\Events\RoomEnded;
 use App\Http\Resources\RoomTypeResource;
 use App\Models\Meeting;
@@ -3627,14 +3627,14 @@ public function test_start_and_join_with_wrong_server_details()
         $server = Server::factory()->create();
         $room->roomType->serverPool->servers()->sync([$server->id]);
 
-        $this->assertEquals(ServerHealth::ONLINE, $server->health);
+        $this->assertEquals(ServerConnectionStatus::ONLINE, $server->connection_status);
 
         // Create meeting
         $this->actingAs($room->owner)->postJson(route('api.v1.rooms.start', ['room' => $room]), ['consent_record_attendance' => false, 'consent_record' => false, 'consent_record_video' => false])
             ->assertStatus(CustomStatusCodes::ROOM_START_FAILED->value);
 
         $server->refresh();
-        $this->assertEquals(ServerHealth::UNHEALTHY, $server->health);
+        $this->assertEquals(ServerConnectionStatus::FAULTY, $server->connection_status);
 
         // Create meeting
         $this->actingAs($room->owner)->postJson(route('api.v1.rooms.join', ['room' => $room]), ['consent_record_attendance' => false, 'consent_record' => false, 'consent_record_video' => false])
@@ -4561,13 +4561,13 @@ public function test_join_server_error()
         $meeting->room->latestMeeting()->associate($meeting);
         $meeting->room->save();
 
-        $this->assertEquals(ServerHealth::ONLINE, $meeting->server->health);
+        $this->assertEquals(ServerConnectionStatus::ONLINE, $meeting->server->connection_status);
 
         $this->actingAs($meeting->room->owner)->postJson(route('api.v1.rooms.join', ['room' => $meeting->room]), ['consent_record_attendance' => true, 'consent_record' => false, 'consent_record_video' => false])
             ->assertStatus(CustomStatusCodes::JOIN_FAILED->value);
 
         $meeting->server->refresh();
-        $this->assertEquals(ServerHealth::ONLINE, $meeting->server->health);
+        $this->assertEquals(ServerConnectionStatus::ONLINE, $meeting->server->connection_status);
     }
 
     /**
diff --git a/tests/Backend/Feature/api/v1/ServerTest.php b/tests/Backend/Feature/api/v1/ServerTest.php
index cb958635b2..9769d8f00c 100644
--- a/tests/Backend/Feature/api/v1/ServerTest.php
+++ b/tests/Backend/Feature/api/v1/ServerTest.php
@@ -5,7 +5,7 @@
 namespace Tests\Backend\Feature\api\v1;
 
 use App\Enums\CustomStatusCodes;
-use App\Enums\ServerHealth;
+use App\Enums\ServerConnectionStatus;
 use App\Enums\ServerStatus;
 use App\Models\Meeting;
 use App\Models\Permission;
@@ -55,7 +55,7 @@ public function test_index()
         $servers = Server::factory()->count(6)->create(['description' => 'test', 'version' => '2.4.5']);
         $serverOnline = Server::factory()->create(['name' => 'serverOnline', 'version' => '2.4.5']);
         $serverOffline = Server::factory()->create(['name' => 'serverOffline', 'version' => '2.4.5', 'error_count' => config('bigbluebutton.server_offline_threshold'), 'recover_count' => 0]);
-        $serverUnhealthy = Server::factory()->create(['name' => 'serverUnhealthy', 'version' => '2.4.5', 'error_count' => 1, 'recover_count' => 0]);
+        $serverFaulty = Server::factory()->create(['name' => 'serverFaulty', 'version' => '2.4.5', 'error_count' => 1, 'recover_count' => 0]);
         $serverDisabled = Server::factory()->create(['name' => 'serverDisabled', 'status' => ServerStatus::DISABLED, 'version' => null]);
         $serverDraining = Server::factory()->create(['name' => 'serverDraining', 'status' => ServerStatus::DRAINING, 'version' => null]);
 
@@ -94,7 +94,8 @@ public function test_index()
                         'name',
                         'description',
                         'strength',
-                        'health',
+                        'connection_status_always_online',
+                        'connection_status',
                         'status',
                         'participant_count',
                         'listener_count',
@@ -133,7 +134,7 @@ public function test_index()
             ->assertSuccessful()
             ->assertJsonCount(5, 'data')
             ->assertJsonFragment(['id' => $serverOnline->id])
-            ->assertJsonFragment(['id' => $serverUnhealthy->id])
+            ->assertJsonFragment(['id' => $serverFaulty->id])
             ->assertJsonFragment(['id' => $serverOffline->id])
             ->assertJsonFragment(['id' => $serverDisabled->id])
             ->assertJsonFragment(['id' => $serverDraining->id]);
@@ -166,37 +167,38 @@ public function test_index()
             ->assertJsonFragment(['id' => Server::orderByDesc('name')->first()->id])
             ->assertJsonMissing(['id' => Server::orderBy('name')->first()->id]);
 
-        // Check server health
+        // Check server connection status
         $response = $this->getJson(route('api.v1.servers.index').'?sort_by=name&sort_direction=asc&query=server')
             ->assertSuccessful()
             ->assertJsonCount(5, 'data');
 
         // Disabled server
-        $this->assertNull($response->json('data.0.health'));
+        $this->assertNull($response->json('data.0.connection_status'));
         // Draining server
-        $this->assertEquals(ServerHealth::ONLINE->value, $response->json('data.1.health'));
+        $this->assertEquals(ServerConnectionStatus::ONLINE->value, $response->json('data.1.connection_status'));
+        // Faulty server
+        $this->assertEquals(ServerConnectionStatus::FAULTY->value, $response->json('data.2.connection_status'));
         // Offline server
-        $this->assertEquals(ServerHealth::OFFLINE->value, $response->json('data.2.health'));
+        $this->assertEquals(ServerConnectionStatus::OFFLINE->value, $response->json('data.3.connection_status'));
         // Online server
-        $this->assertEquals(ServerHealth::ONLINE->value, $response->json('data.3.health'));
-        // Unhealthy server
-        $this->assertEquals(ServerHealth::UNHEALTHY->value, $response->json('data.4.health'));
+        $this->assertEquals(ServerConnectionStatus::ONLINE->value, $response->json('data.4.connection_status'));
 
-        // Request with forced usage update, should see that the online servers are now unhealthy (because it's fake data)
+        // Request with forced usage update, should see that the online servers are now faulty (because it's fake data)
         $response = $this->getJson(route('api.v1.servers.index').'?sort_by=name&sort_direction=asc&query=server&update_usage=1')
             ->assertSuccessful()
             ->assertJsonCount($page_size, 'data');
 
         // Disabled server
-        $this->assertNull($response->json('data.0.health'));
+        $this->assertNull($response->json('data.0.connection_status'));
         // Draining server
-        $this->assertEquals(ServerHealth::UNHEALTHY->value, $response->json('data.1.health'));
+        $this->assertEquals(ServerConnectionStatus::FAULTY->value, $response->json('data.1.connection_status'));
+        // Faulty server
+        $this->assertEquals(ServerConnectionStatus::FAULTY->value, $response->json('data.2.connection_status'));
         // Offline server
-        $this->assertEquals(ServerHealth::OFFLINE->value, $response->json('data.2.health'));
+        $this->assertEquals(ServerConnectionStatus::OFFLINE->value, $response->json('data.3.connection_status'));
         // Online server
-        $this->assertEquals(ServerHealth::UNHEALTHY->value, $response->json('data.3.health'));
-        // Unhealthy server
-        $this->assertEquals(ServerHealth::UNHEALTHY->value, $response->json('data.4.health'));
+        $this->assertEquals(ServerConnectionStatus::FAULTY->value, $response->json('data.4.connection_status'));
+
     }
 
     /**
@@ -232,8 +234,9 @@ public function test_show()
                 'base_url' => $server->base_url,
                 'secret' => $server->secret,
                 'strength' => $server->strength,
+                'connection_status_always_online' => $server->connection_status_always_online,
                 'status' => $server->status,
-                'health' => $server->health->value,
+                'connection_status' => $server->connection_status->value,
                 'participant_count' => $server->participant_count,
                 'listener_count' => $server->listener_count,
                 'voice_participant_count' => $server->voice_participant_count,
@@ -271,6 +274,7 @@ public function test_create()
             'secret' => $server->secret,
             'strength' => 5,
             'status' => ServerStatus::ENABLED->value,
+            'connection_status_always_online' => false,
         ];
 
         // Test guests
@@ -291,7 +295,7 @@ public function test_create()
         $this->actingAs($this->user)->postJson(route('api.v1.servers.store'), $data)
             ->assertSuccessful()
             ->assertJsonFragment(
-                ['base_url' => $server->base_url, 'description' => $server->description, 'secret' => $server->secret, 'strength' => 5, 'status' => ServerStatus::ENABLED->value, 'health' => ServerHealth::UNHEALTHY]
+                ['base_url' => $server->base_url, 'description' => $server->description, 'secret' => $server->secret, 'strength' => 5, 'status' => ServerStatus::ENABLED->value, 'connection_status' => ServerConnectionStatus::FAULTY]
             );
 
         // Test with some existing base url
@@ -315,8 +319,9 @@ public function test_create()
         $data['secret'] = '';
         $data['strength'] = 1000;
         $data['status'] = 10;
+        $data['connection_status_always_online'] = 'invalid';
         $this->actingAs($this->user)->postJson(route('api.v1.servers.store'), $data)
-            ->assertJsonValidationErrors(['base_url', 'secret', 'name', 'strength', 'status']);
+            ->assertJsonValidationErrors(['base_url', 'secret', 'name', 'strength', 'status', 'connection_status_always_online']);
     }
 
     /**
@@ -334,6 +339,7 @@ public function test_update()
             'secret' => $server->secret,
             'strength' => $server->strength,
             'status' => ServerStatus::DISABLED->value,
+            'connection_status_always_online' => false,
         ];
 
         // Test guests
@@ -363,7 +369,7 @@ public function test_update()
                 ['base_url' => $server->base_url, 'secret' => $server->secret, 'status' => $server->status->value]
             );
 
-        // Change health to offline if server is not reachable
+        // Change connection status to offline if server is not reachable
         $server->refresh();
         $data['status'] = ServerStatus::ENABLED->value;
         $data['updated_at'] = $server->updated_at;
@@ -371,9 +377,18 @@ public function test_update()
             ->assertSuccessful()
             ->assertJsonFragment([
                 'status' => ServerStatus::ENABLED->value,
-                'health' => ServerHealth::UNHEALTHY->value,
+                'connection_status' => ServerConnectionStatus::FAULTY->value,
             ]);
 
+        // Test with connection status always online is true
+        $server->refresh();
+        $data['connection_status_always_online'] = true;
+        $data['updated_at'] = $server->updated_at;
+        $this->actingAs($this->user)->putJson(route('api.v1.servers.update', ['server' => $server->id]), $data)
+            ->assertSuccessful()
+            ->assertJsonFragment(['connection_status' => ServerConnectionStatus::ONLINE->value])
+            ->assertJsonFragment(['connection_status_always_online' => true]);
+
         // Test with base url of an other server
         $server->refresh();
         $data['base_url'] = $server2->base_url;
@@ -397,9 +412,10 @@ public function test_update()
         $data['secret'] = '';
         $data['strength'] = 1000;
         $data['status'] = 10;
+        $data['connection_status_always_online'] = 'invalid';
         $data['updated_at'] = $server->updated_at;
         $this->actingAs($this->user)->putJson(route('api.v1.servers.update', ['server' => $server->id]), $data)
-            ->assertJsonValidationErrors(['base_url', 'secret', 'name', 'strength', 'status']);
+            ->assertJsonValidationErrors(['base_url', 'secret', 'name', 'strength', 'status', 'connection_status_always_online']);
 
         // Test deleted
         $server->status = ServerStatus::DISABLED;
diff --git a/tests/Backend/Unit/Console/PollServerTest.php b/tests/Backend/Unit/Console/PollServerTest.php
index e34b30b61d..66e50d3083 100644
--- a/tests/Backend/Unit/Console/PollServerTest.php
+++ b/tests/Backend/Unit/Console/PollServerTest.php
@@ -4,7 +4,7 @@
 
 namespace Tests\Backend\Unit\Console;
 
-use App\Enums\ServerHealth;
+use App\Enums\ServerConnectionStatus;
 use App\Models\Meeting;
 use App\Models\Room;
 use App\Models\Server;
@@ -52,20 +52,20 @@ public function test_server_offline()
         // Poll server, first time failing
         $this->artisan('server:poll');
 
-        // Check if health is set to unhealthy
+        // Check if connection status is set to faulty
         $server->refresh();
-        $this->assertEquals(ServerHealth::UNHEALTHY, $server->health);
+        $this->assertEquals(ServerConnectionStatus::FAULTY, $server->connection_status);
 
-        // Check if live usage data is not reset during unhealthy state
+        // Check if live usage data is not reset during faulty state
         $this->assertNotNull($server->participant_count);
         $this->assertNotNull($room->participant_count);
 
         // Poll server, second time failing
         $this->artisan('server:poll');
 
-        // Check if health is set to offline
+        // Check if connection status is set to offline
         $server->refresh();
-        $this->assertEquals(ServerHealth::OFFLINE, $server->health);
+        $this->assertEquals(ServerConnectionStatus::OFFLINE, $server->connection_status);
 
         // Check if live usage data is reset
         $this->assertNull($server->participant_count);
diff --git a/tests/Backend/Unit/ServerPoolTest.php b/tests/Backend/Unit/ServerPoolTest.php
index 6b46ae7221..f24d494ec0 100644
--- a/tests/Backend/Unit/ServerPoolTest.php
+++ b/tests/Backend/Unit/ServerPoolTest.php
@@ -25,9 +25,9 @@ public function test_load_balancing()
             'bigbluebutton.server_offline_threshold' => 3,
         ]);
 
-        $unhealthy = Server::factory()->create(['status' => ServerStatus::ENABLED]);
-        $unhealthy->error_count = 1;
-        $unhealthy->save();
+        $faulty = Server::factory()->create(['status' => ServerStatus::ENABLED]);
+        $faulty->error_count = 1;
+        $faulty->save();
         $offline = Server::factory()->create(['status' => ServerStatus::ENABLED]);
         $offline->error_count = 3;
         $offline->save();
@@ -37,7 +37,7 @@ public function test_load_balancing()
         $heavyUsage = Server::factory()->create(['load' => 20, 'strength' => 1]);
 
         $serverPool = ServerPool::factory()->create();
-        $serverPool->servers()->sync([$unhealthy->id, $offline->id, $draining->id, $disabled->id, $offline->id, $lightUsage->id, $heavyUsage->id]);
+        $serverPool->servers()->sync([$faulty->id, $offline->id, $draining->id, $disabled->id, $offline->id, $lightUsage->id, $heavyUsage->id]);
         $loadBalancingService = new LoadBalancingService;
         $loadBalancingService->setServerPool($serverPool);
 
@@ -55,10 +55,44 @@ public function test_load_balancing()
         $this->assertEquals($heavyUsage->id, $server->id);
 
         // Check server that should not be used for load balancing
-        $serverPool->servers()->sync([$unhealthy->id, $offline->id, $draining->id, $disabled->id, $offline->id]);
+        $serverPool->servers()->sync([$faulty->id, $offline->id, $draining->id, $disabled->id, $offline->id]);
         $serverPool->refresh();
         $loadBalancingService->setServerPool($serverPool);
         $server = $loadBalancingService->getLowestUsageServer();
         $this->assertNull($server);
     }
+
+    public function test_load_balancing_always_online()
+    {
+        config([
+            'bigbluebutton.server_online_threshold' => 3,
+            'bigbluebutton.server_offline_threshold' => 3,
+        ]);
+
+        $always_online_with_error = Server::factory()->create(['connection_status_always_online' => true, 'status' => ServerStatus::ENABLED, 'error_count' => 1, 'load' => 5]);
+        $always_online_not_recovered = Server::factory()->create(['connection_status_always_online' => true, 'status' => ServerStatus::ENABLED, 'recover_count' => 1, 'load' => 5]);
+        $always_online_disabled = Server::factory()->create(['connection_status_always_online' => true, 'status' => ServerStatus::DISABLED, 'load' => 5]);
+        $lightUsage = Server::factory()->create(['load' => 1]);
+        $heavyUsage = Server::factory()->create(['load' => 20]);
+
+        $serverPool = ServerPool::factory()->create();
+        $loadBalancingService = new LoadBalancingService;
+        $loadBalancingService->setServerPool($serverPool);
+
+        // Disabled always online servers are never picked
+        $serverPool->servers()->sync([$heavyUsage, $always_online_disabled]);
+        $this->assertEquals($heavyUsage->id, $loadBalancingService->getLowestUsageServer()->id);
+
+        // Always online servers are picked, even with error_count
+        $serverPool->servers()->sync([$heavyUsage, $always_online_with_error]);
+        $this->assertEquals($always_online_with_error->id, $loadBalancingService->getLowestUsageServer()->id);
+
+        // Always online servers are picked, even with recover_count too low
+        $serverPool->servers()->sync([$heavyUsage, $always_online_not_recovered]);
+        $this->assertEquals($always_online_not_recovered->id, $loadBalancingService->getLowestUsageServer()->id);
+
+        // Load is still considered
+        $serverPool->servers()->sync([$lightUsage, $heavyUsage, $always_online_not_recovered, $always_online_disabled, $always_online_not_recovered]);
+        $this->assertEquals($lightUsage->id, $loadBalancingService->getLowestUsageServer()->id);
+    }
 }
diff --git a/tests/Backend/Unit/ServerServiceTest.php b/tests/Backend/Unit/ServerServiceTest.php
index ba6838557b..54d08a2e42 100644
--- a/tests/Backend/Unit/ServerServiceTest.php
+++ b/tests/Backend/Unit/ServerServiceTest.php
@@ -4,7 +4,7 @@
 
 namespace Tests\Backend\Unit;
 
-use App\Enums\ServerHealth;
+use App\Enums\ServerConnectionStatus;
 use App\Enums\ServerStatus;
 use App\Events\RoomEnded;
 use App\Models\Meeting;
@@ -257,7 +257,7 @@ public function test_version_update()
         $this->assertNull($server->version);
     }
 
-    public function test_server_health_failing()
+    public function test_server_connection_status_failing()
     {
         config([
             'bigbluebutton.server_online_threshold' => 3,
@@ -280,28 +280,28 @@ public function test_server_health_failing()
         $serverService->updateUsage();
 
         $server->refresh();
-        $this->assertEquals(ServerHealth::UNHEALTHY, $server->health);
+        $this->assertEquals(ServerConnectionStatus::FAULTY, $server->connection_status);
 
         // Recover
         $serverService->updateUsage();
 
         $server->refresh();
-        $this->assertEquals(ServerHealth::UNHEALTHY, $server->health);
+        $this->assertEquals(ServerConnectionStatus::FAULTY, $server->connection_status);
 
         // Fail again (2 fail)
         $serverService->updateUsage();
 
         $server->refresh();
-        $this->assertEquals(ServerHealth::UNHEALTHY, $server->health);
+        $this->assertEquals(ServerConnectionStatus::FAULTY, $server->connection_status);
 
         // Fail again (3 fail)
         $serverService->updateUsage();
 
         $server->refresh();
-        $this->assertEquals(ServerHealth::OFFLINE, $server->health);
+        $this->assertEquals(ServerConnectionStatus::OFFLINE, $server->connection_status);
     }
 
-    public function test_server_health_single_failure()
+    public function test_server_connection_status_single_failure()
     {
         config([
             'bigbluebutton.server_online_threshold' => 3,
@@ -324,28 +324,28 @@ public function test_server_health_single_failure()
         $serverService->updateUsage();
 
         $server->refresh();
-        $this->assertEquals(ServerHealth::UNHEALTHY, $server->health);
+        $this->assertEquals(ServerConnectionStatus::FAULTY, $server->connection_status);
 
         // Recover (1 recover)
         $serverService->updateUsage();
 
         $server->refresh();
-        $this->assertEquals(ServerHealth::UNHEALTHY, $server->health);
+        $this->assertEquals(ServerConnectionStatus::FAULTY, $server->connection_status);
 
         // Recover (2 recover)
         $serverService->updateUsage();
 
         $server->refresh();
-        $this->assertEquals(ServerHealth::UNHEALTHY, $server->health);
+        $this->assertEquals(ServerConnectionStatus::FAULTY, $server->connection_status);
 
         // Recover (3 recover)
         $serverService->updateUsage();
 
         $server->refresh();
-        $this->assertEquals(ServerHealth::ONLINE, $server->health);
+        $this->assertEquals(ServerConnectionStatus::ONLINE, $server->connection_status);
     }
 
-    public function test_server_health_recovering()
+    public function test_server_connection_status_recovering()
     {
         config([
             'bigbluebutton.server_online_threshold' => 3,
@@ -369,31 +369,31 @@ public function test_server_health_recovering()
         $serverService->updateUsage();
 
         $server->refresh();
-        $this->assertEquals(ServerHealth::OFFLINE, $server->health);
+        $this->assertEquals(ServerConnectionStatus::OFFLINE, $server->connection_status);
 
         // Fail again
         $serverService->updateUsage();
 
         $server->refresh();
-        $this->assertEquals(ServerHealth::OFFLINE, $server->health);
+        $this->assertEquals(ServerConnectionStatus::OFFLINE, $server->connection_status);
 
         // Recover (1 new recover)
         $serverService->updateUsage();
 
         $server->refresh();
-        $this->assertEquals(ServerHealth::OFFLINE, $server->health);
+        $this->assertEquals(ServerConnectionStatus::OFFLINE, $server->connection_status);
 
         // Recover (2 new recover)
         $serverService->updateUsage();
 
         $server->refresh();
-        $this->assertEquals(ServerHealth::OFFLINE, $server->health);
+        $this->assertEquals(ServerConnectionStatus::OFFLINE, $server->connection_status);
 
         // Recover (3 new recover)
         $serverService->updateUsage();
 
         $server->refresh();
-        $this->assertEquals(ServerHealth::ONLINE, $server->health);
+        $this->assertEquals(ServerConnectionStatus::ONLINE, $server->connection_status);
     }
 
     public function test_detach_meeting_on_offline()
@@ -423,7 +423,7 @@ public function test_detach_meeting_on_offline()
 
         $server->refresh();
         $meeting->refresh();
-        $this->assertEquals(ServerHealth::UNHEALTHY, $server->health);
+        $this->assertEquals(ServerConnectionStatus::FAULTY, $server->connection_status);
         $this->assertNull($meeting->detached);
 
         // Recover
@@ -431,7 +431,7 @@ public function test_detach_meeting_on_offline()
 
         $server->refresh();
         $meeting->refresh();
-        $this->assertEquals(ServerHealth::UNHEALTHY, $server->health);
+        $this->assertEquals(ServerConnectionStatus::FAULTY, $server->connection_status);
         $this->assertNull($meeting->detached);
 
         // Fail again (2 fail)
@@ -439,7 +439,7 @@ public function test_detach_meeting_on_offline()
 
         $server->refresh();
         $meeting->refresh();
-        $this->assertEquals(ServerHealth::UNHEALTHY, $server->health);
+        $this->assertEquals(ServerConnectionStatus::FAULTY, $server->connection_status);
         $this->assertNull($meeting->detached);
 
         // Fail again (3 fail)
@@ -447,7 +447,7 @@ public function test_detach_meeting_on_offline()
 
         $server->refresh();
         $meeting->refresh();
-        $this->assertEquals(ServerHealth::OFFLINE, $server->health);
+        $this->assertEquals(ServerConnectionStatus::OFFLINE, $server->connection_status);
         $this->assertNotNull($meeting->detached);
     }
 
@@ -481,7 +481,7 @@ public function test_end_detached_meeting_on_online()
 
         $server->refresh();
         $meeting->refresh();
-        $this->assertEquals(ServerHealth::OFFLINE, $server->health);
+        $this->assertEquals(ServerConnectionStatus::OFFLINE, $server->connection_status);
         $this->assertNotNull($meeting->detached);
         $this->assertNull($meeting->end);
 
@@ -490,7 +490,44 @@ public function test_end_detached_meeting_on_online()
 
         $server->refresh();
         $meeting->refresh();
-        $this->assertEquals(ServerHealth::OFFLINE, $server->health);
+        $this->assertEquals(ServerConnectionStatus::OFFLINE, $server->connection_status);
+        $this->assertNotNull($meeting->detached);
+        $this->assertNotNull($meeting->end);
+
+        // Check if meeting ended event is fired
+        Event::assertDispatched(RoomEnded::class);
+    }
+
+    public function test_end_detached_meeting_on_online_with_connection_status_always_online()
+    {
+        Event::fake([
+            RoomEnded::class,
+        ]);
+
+        config([
+            'bigbluebutton.server_online_threshold' => 3,
+            'bigbluebutton.server_offline_threshold' => 3,
+        ]);
+
+        Http::fake([
+            'test.notld/bigbluebutton/api/getMeetings*' => Http::sequence()
+                ->push(file_get_contents(__DIR__.'/../Fixtures/GetMeetings-Start.xml')),
+            'test.notld/bigbluebutton/api/end?meetingID=409e94ee-e317-4040-8cb2-8000a289b49d&checksum=*' => Http::response(file_get_contents(__DIR__.'/../Fixtures/EndMeeting.xml')),
+        ]);
+
+        // Create server
+        $server = Server::factory()->create(['connection_status_always_online' => true]);
+        $serverService = new ServerService($server);
+
+        // Create detached meeting
+        $meeting = Meeting::factory()->create(['id' => '409e94ee-e317-4040-8cb2-8000a289b49d', 'server_id' => $server->id, 'end' => null, 'detached' => now()]);
+
+        // Update server usage
+        $serverService->updateUsage();
+
+        $server->refresh();
+        $meeting->refresh();
+        $this->assertEquals(ServerConnectionStatus::ONLINE, $server->connection_status);
         $this->assertNotNull($meeting->detached);
         $this->assertNotNull($meeting->end);
 
@@ -594,6 +631,32 @@ public function test_server_draining()
         $this->assertEquals(ServerStatus::DISABLED, $server->status);
     }
 
+    public function test_server_draining_with_connection_status_always_online()
+    {
+        Http::fake([
+            'test.notld/bigbluebutton/api/getMeetings*' => Http::sequence()
+                ->push(file_get_contents(__DIR__.'/../Fixtures/GetMeetings-Start.xml'))
+                ->push(file_get_contents(__DIR__.'/../Fixtures/GetMeetings-End.xml')),
+        ]);
+
+        $server = Server::factory()->create(['status' => ServerStatus::DRAINING, 'connection_status_always_online' => true]);
+        $serverService = new ServerService($server);
+
+        // check if server is not disabled if meetings are left
+        Meeting::factory()->create(['id' => '409e94ee-e317-4040-8cb2-8000a289b49d', 'end' => null, 'server_id' => $server->id]);
+
+        $serverService->updateUsage();
+
+        $server->refresh();
+        $this->assertEquals(ServerStatus::DRAINING, $server->status);
+
+        // Test if server is disabled on next poll if meeting is ended
+        $serverService->updateUsage();
+
+        $server->refresh();
+        $this->assertEquals(ServerStatus::DISABLED, $server->status);
+    }
+
     public function test_server_load()
     {
         config([
@@ -713,4 +776,77 @@ public function test_hashing_algorithm_sha512()
         $hash = hash('sha512', 'getMeetings'.$server->secret);
         $this->assertEquals($hash, $request->data()['checksum']);
     }
+
+    /**
+     * Test that connection status counters are not changed when connection_status_always_online is true on API failure
+     */
+    public function test_connection_status_always_online_on_api_failure()
+    {
+        config([
+            'bigbluebutton.server_online_threshold' => 3,
+            'bigbluebutton.server_offline_threshold' => 3,
+        ]);
+
+        Http::fake([
+            'test.notld/bigbluebutton/api/getMeetings*' => Http::sequence()
+                ->pushResponse(fn () => throw new ConnectionException('Connection timed out'))
+                ->pushResponse(fn () => throw new ConnectionException('Connection timed out'))
+                ->pushResponse(fn () => throw new ConnectionException('Connection timed out'))
+                ->pushResponse(fn () => throw new ConnectionException('Connection timed out')),
+        ]);
+
+        $server = Server::factory()->create(['connection_status_always_online' => true]);
+        $serverService = new ServerService($server);
+
+        $initialErrorCount = $server->error_count;
+        $initialRecoverCount = $server->recover_count;
+        $initialLoad = $server->load;
+
+        // Call multiple times - counters should not change
+        $serverService->updateUsage();
+        $server->refresh();
+        $this->assertEquals($initialErrorCount, $server->error_count);
+        $this->assertEquals($initialRecoverCount, $server->recover_count);
+        $this->assertEquals($initialLoad, $server->load);
+
+        $serverService->updateUsage();
+        $server->refresh();
+        $this->assertEquals($initialErrorCount, $server->error_count);
+        $this->assertEquals($initialRecoverCount, $server->recover_count);
+        $this->assertEquals($initialLoad, $server->load);
+    }
+
+    /**
+     * Test that connection status counters are not changed when connection_status_always_online is true on successful API call
+     */
+    public function test_connection_status_always_online_on_api_success()
+    {
+        config([
+            'bigbluebutton.server_online_threshold' => 3,
+            'bigbluebutton.server_offline_threshold' => 3,
+        ]);
+
+        Http::fake([
+            'test.notld/bigbluebutton/api/getMeetings*' => Http::sequence()
+                ->push(file_get_contents(__DIR__.'/../Fixtures/GetMeetings-Start.xml'))
+                ->push(file_get_contents(__DIR__.'/../Fixtures/GetMeetings-Start.xml')),
+        ]);
+
+        $server = Server::factory()->create(['connection_status_always_online' => true, 'error_count' => 1, 'recover_count' => 0]);
+        $serverService = new ServerService($server);
+
+        $initialErrorCount = $server->error_count;
+        $initialRecoverCount = $server->recover_count;
+
+        // Call - counters should not change
+        $serverService->updateUsage();
+        $server->refresh();
+        $this->assertEquals($initialErrorCount, $server->error_count);
+        $this->assertEquals($initialRecoverCount, $server->recover_count);
+
+        $serverService->updateUsage();
+        $server->refresh();
+        $this->assertEquals($initialErrorCount, $server->error_count);
+        $this->assertEquals($initialRecoverCount, $server->recover_count);
+    }
 }
diff --git a/tests/Backend/Unit/ServerTest.php b/tests/Backend/Unit/ServerTest.php
index e29b22d30b..330d0f8694 100644
--- a/tests/Backend/Unit/ServerTest.php
+++ b/tests/Backend/Unit/ServerTest.php
@@ -4,7 +4,7 @@
 
 namespace Tests\Backend\Unit;
 
-use App\Enums\ServerHealth;
+use App\Enums\ServerConnectionStatus;
 use App\Enums\ServerStatus;
 use App\Models\Server;
 use Illuminate\Foundation\Testing\RefreshDatabase;
@@ -47,7 +47,7 @@ public function test_usage_cleared_on_disabled()
         $this->assertNull($server->version);
     }
 
-    public function test_server_health()
+    public function test_server_connection_status()
     {
         config([
             'bigbluebutton.server_online_threshold' => 3,
@@ -60,20 +60,43 @@ public function test_server_health()
         $server->recover_count = config('bigbluebutton.server_online_threshold');
         $server->save();
 
-        $this->assertEquals(ServerHealth::ONLINE, $server->health);
+        $this->assertEquals(ServerConnectionStatus::ONLINE, $server->connection_status);
 
         // Check failing
         $server->error_count = 1;
         $server->recover_count = 0;
         $server->save();
 
-        $this->assertEquals(ServerHealth::UNHEALTHY, $server->health);
+        $this->assertEquals(ServerConnectionStatus::FAULTY, $server->connection_status);
 
         // Check offline
         $server->error_count = config('bigbluebutton.server_offline_threshold');
         $server->recover_count = 0;
         $server->save();
 
-        $this->assertEquals(ServerHealth::OFFLINE, $server->health);
+        $this->assertEquals(ServerConnectionStatus::OFFLINE, $server->connection_status);
+
+        // Check disabled
+        $server->status = ServerStatus::DISABLED;
+        $server->error_count = 0;
+        $server->recover_count = config('bigbluebutton.server_online_threshold');
+        $server->save();
+        $this->assertNull($server->connection_status);
+
+        // Check always online
+        $server->status = ServerStatus::ENABLED;
+        $server->connection_status_always_online = true;
+        $server->error_count = 1;
+        $server->recover_count = 1;
+        $server->save();
+        $this->assertEquals(ServerConnectionStatus::ONLINE, $server->connection_status);
+
+        // Check always online and disabled
+        $server->status = ServerStatus::DISABLED;
+        $server->connection_status_always_online = true;
+        $server->error_count = 1;
+        $server->recover_count = 1;
+        $server->save();
+        $this->assertNull($server->connection_status);
     }
 }
diff --git a/tests/Frontend/e2e/AdminServerPoolsNew.cy.js b/tests/Frontend/e2e/AdminServerPoolsNew.cy.js
index 53d2b542ab..d362ac7d14 100644
--- a/tests/Frontend/e2e/AdminServerPoolsNew.cy.js
+++ b/tests/Frontend/e2e/AdminServerPoolsNew.cy.js
@@ -101,7 +101,7 @@ describe("Admin server pools new", function () {
 
     // Check if correct options are shown
     cy.get(".multiselect__content").should("be.visible");
-    cy.get(".multiselect__option").should("have.length", 6);
+    cy.get(".multiselect__option").should("have.length", 7);
     cy.get(".multiselect__option")
       .eq(0)
       .should("include.text", "Server 01")
@@ -120,6 +120,10 @@ describe("Admin server pools new", function () {
       .and("be.visible");
     cy.get(".multiselect__option")
       .eq(4)
+      .should("include.text", "Server 05")
+      .and("be.visible");
+    cy.get(".multiselect__option")
+      .eq(5)
       .should(
         "include.text",
         "No elements found. Consider changing the search query.",
@@ -127,7 +131,7 @@ describe("Admin server pools new", function () {
       .and("not.be.visible");
 
     cy.get(".multiselect__option")
-      .eq(5)
+      .eq(6)
       .should("include.text", "admin.servers.no_data")
       .and("not.be.visible");
 
diff --git a/tests/Frontend/e2e/AdminServersEdit.cy.js b/tests/Frontend/e2e/AdminServersEdit.cy.js
index 32776b43ad..884bbf18cf 100644
--- a/tests/Frontend/e2e/AdminServersEdit.cy.js
+++ b/tests/Frontend/e2e/AdminServersEdit.cy.js
@@ -231,11 +231,23 @@ describe("Admin servers edit", function () {
       "admin.servers.enabled",
     );
 
-    cy.get('[data-test="health-status-field"]')
+    cy.get('[data-test="connection-status-always-online-field"]')
+      .should("be.visible")
+      .and("include.text", "admin.servers.connection_status_always_online")
+      .and(
+        "include.text",
+        "admin.servers.connection_status_always_online_description",
+      )
+      .within(() => {
+        cy.get("#connection-status-always-online").should("not.be.checked");
+        cy.get("#connection-status-always-online").click();
+      });
+
+    cy.get('[data-test="connection-status-field"]')
       .should("be.visible")
       .and("include.text", "admin.servers.connection")
       .within(() => {
-        cy.get("#healthStatus")
+        cy.get("#connectionStatus")
           .should("have.value", "admin.servers.online")
           .and("be.disabled");
         cy.get('[data-test="servers-test-connection-button"]')
@@ -263,6 +275,7 @@ describe("Admin servers edit", function () {
       server.data.base_url = "https://localhost/bigbluebutton2";
       server.data.secret = "Secret123456789";
       server.data.strength = 6;
+      server.data.connection_status_always_online = true;
 
       const saveChangesRequest = interceptIndefinitely(
         "PUT",
@@ -302,7 +315,11 @@ describe("Admin servers edit", function () {
         cy.get(".p-select-label").should("have.attr", "aria-disabled", "true");
       });
 
-      cy.get("#healthStatus").and("be.disabled");
+      cy.get("#connection-status-always-online")
+        .should("be.checked")
+        .and("be.disabled");
+
+      cy.get("#connectionStatus").and("be.disabled");
 
       cy.get('button[data-test="servers-cancel-edit-button"]')
         .should("be.visible")
@@ -371,6 +388,9 @@ describe("Admin servers edit", function () {
           secret: ["The secret field is required."],
           strength: ["The strength field is required."],
           status: ["The status field is required."],
+          connection_status_always_online: [
+            "The connection status always online field is required.",
+          ],
         },
       },
     }).as("saveChangesRequest");
@@ -412,6 +432,11 @@ describe("Admin servers edit", function () {
       "The status field is required.",
     );
 
+    cy.get('[data-test="connection-status-always-online-field"]').should(
+      "include.text",
+      "The connection status always online field is required.",
+    );
+
     // Set values
     cy.get("#name").and("have.value", "Server 01").clear();
     cy.get("#name").type("Server 02");
@@ -437,6 +462,7 @@ describe("Admin servers edit", function () {
     cy.get('[data-test="status-dropdown"]').click();
     cy.get('[data-test="status-dropdown-items"]').should("be.visible");
     cy.get('[data-test="status-dropdown-option"]').eq(2).click();
+    cy.get("#connection-status-always-online").click();
 
     // Check with 500 error
     cy.intercept("PUT", "api/v1/servers/1", {
@@ -487,6 +513,11 @@ describe("Admin servers edit", function () {
       "The status field is required.",
     );
 
+    cy.get('[data-test="connection-status-always-online-field"]').should(
+      "not.include.text",
+      "The connection status always online field is required.",
+    );
+
     // Check with 428 error (stale error)
     cy.fixture("server.json").then((server) => {
       server.data.name = "Server 03";
@@ -495,6 +526,7 @@ describe("Admin servers edit", function () {
       server.data.secret = "Secret987654321";
       server.data.strength = 5;
       server.data.status = 1;
+      server.data.connection_status_always_online = true;
 
       cy.intercept("PUT", "api/v1/servers/1", {
         statusCode: 428,
@@ -564,6 +596,8 @@ describe("Admin servers edit", function () {
       "admin.servers.enabled",
     );
 
+    cy.get("#connection-status-always-online").should("be.checked");
+
     // Trigger 428 error (stale error) again
     cy.fixture("server.json").then((server) => {
       server.data.name = "Server 04";
@@ -572,6 +606,7 @@ describe("Admin servers edit", function () {
       server.data.secret = "123456789Secret";
       server.data.strength = 4;
       server.data.status = 10;
+      server.data.connection_status_always_online = false;
 
       cy.intercept("PUT", "api/v1/servers/1", {
         statusCode: 428,
@@ -614,6 +649,7 @@ describe("Admin servers edit", function () {
       server.data.secret = "Secret987654321";
       server.data.strength = 5;
       server.data.status = 1;
+      server.data.connection_status_always_online = true;
 
       cy.intercept("PUT", "api/v1/servers/1", {
         statusCode: 200,
diff --git a/tests/Frontend/e2e/AdminServersIndex.cy.js b/tests/Frontend/e2e/AdminServersIndex.cy.js
index 63ab497339..edfed787e0 100644
--- a/tests/Frontend/e2e/AdminServersIndex.cy.js
+++ b/tests/Frontend/e2e/AdminServersIndex.cy.js
@@ -133,7 +133,7 @@ describe("Admin servers index", function () {
       .should("have.text", "admin.servers.video_count");
 
     // Check that servers are displayed correctly
-    cy.get('[data-test="server-item"]').should("have.length", 4);
+    cy.get('[data-test="server-item"]').should("have.length", 5);
 
     cy.get('[data-test="server-item"]')
       .eq(0)
@@ -147,12 +147,17 @@ describe("Admin servers index", function () {
         cy.get('[data-test="server-item-cell"]')
           .eq(1)
           .find("span")
-          .should("include.attr", "aria-label", "admin.servers.enabled");
+          .should("include.attr", "aria-label", "admin.servers.enabled")
+          .find(".p-tag-icon")
+          .should("have.class", "fa-play");
 
         cy.get('[data-test="server-item-cell"]')
           .eq(2)
           .find("span")
-          .should("include.attr", "aria-label", "admin.servers.online");
+          .should("include.attr", "aria-label", "admin.servers.online")
+          .should("not.include.text", "()")
+          .find(".p-tag-icon")
+          .should("have.class", "fa-check");
 
         cy.get('[data-test="server-item-cell"]')
           .eq(3)
@@ -179,12 +184,16 @@ describe("Admin servers index", function () {
         cy.get('[data-test="server-item-cell"]')
           .eq(1)
           .find("span")
-          .should("include.attr", "aria-label", "admin.servers.enabled");
+          .should("include.attr", "aria-label", "admin.servers.enabled")
+          .find(".p-tag-icon")
+          .should("have.class", "fa-play");
 
         cy.get('[data-test="server-item-cell"]')
           .eq(2)
           .find("span")
-          .should("include.attr", "aria-label", "admin.servers.unhealthy");
+          .should("include.attr", "aria-label", "admin.servers.faulty")
+          .find(".p-tag-icon")
+          .should("have.class", "fa-triangle-exclamation");
 
         cy.get('[data-test="server-item-cell"]')
           .eq(3)
@@ -213,12 +222,13 @@ describe("Admin servers index", function () {
         cy.get('[data-test="server-item-cell"]')
           .eq(1)
           .find("span")
-          .should("include.attr", "aria-label", "admin.servers.disabled");
+          .should("include.attr", "aria-label", "admin.servers.disabled")
+          .find(".p-tag-icon")
+          .should("have.class", "fa-stop");
 
         cy.get('[data-test="server-item-cell"]')
           .eq(2)
-          .find("span")
-          .should("include.attr", "aria-label", "admin.servers.offline");
+          .should("have.text", " --- ");
 
         cy.get('[data-test="server-item-cell"]')
           .eq(3)
@@ -249,12 +259,57 @@ describe("Admin servers index", function () {
         cy.get('[data-test="server-item-cell"]')
           .eq(1)
           .find("span")
-          .should("include.attr", "aria-label", "admin.servers.draining");
+          .should("include.attr", "aria-label", "admin.servers.draining")
+          .find(".p-tag-icon")
+          .should("have.class", "fa-pause");
+
+        cy.get('[data-test="server-item-cell"]')
+          .eq(2)
+          .find("span")
+          .should("include.attr", "aria-label", "admin.servers.offline")
+          .find(".p-tag-icon")
+          .should("have.class", "fa-xmark");
+
+        cy.get('[data-test="server-item-cell"]')
+          .eq(3)
+          .should("have.text", " --- ");
+
+        cy.get('[data-test="server-item-cell"]')
+          .eq(4)
+          .should("have.text", " --- ");
+
+        cy.get('[data-test="server-item-cell"]')
+          .eq(5)
+          .should("have.text", " --- ");
+
+        cy.get('[data-test="server-item-cell"]')
+          .eq(6)
+          .should("have.text", " --- ");
+      });
+
+    cy.get('[data-test="server-item"]')
+      .eq(4)
+      .within(() => {
+        cy.get('[data-test="server-item-cell"]').should("have.length", 7);
+
+        cy.get('[data-test="server-item-cell"]')
+          .eq(0)
+          .should("have.text", "Server 05");
+
+        cy.get('[data-test="server-item-cell"]')
+          .eq(1)
+          .find("span")
+          .should("include.attr", "aria-label", "admin.servers.enabled")
+          .find(".p-tag-icon")
+          .should("have.class", "fa-play");
 
         cy.get('[data-test="server-item-cell"]')
           .eq(2)
           .find("span")
-          .should("include.attr", "aria-label", "admin.servers.online");
+          .should("include.attr", "aria-label", "admin.servers.always_online")
+          .should("include.text", "()")
+          .find(".p-tag-icon")
+          .should("have.class", "fa-check");
 
         cy.get('[data-test="server-item-cell"]')
           .eq(3)
@@ -312,7 +367,7 @@ describe("Admin servers index", function () {
 
     cy.fixture("servers.json").then((servers) => {
       servers.data = servers.data.slice(0, 1);
-      servers.meta.last_page = 4;
+      servers.meta.last_page = 5;
       servers.meta.per_page = 1;
       servers.meta.to = 1;
 
@@ -384,7 +439,7 @@ describe("Admin servers index", function () {
 
     cy.fixture("servers.json").then((servers) => {
       servers.data = servers.data.slice(0, 1);
-      servers.meta.last_page = 4;
+      servers.meta.last_page = 5;
       servers.meta.per_page = 1;
       servers.meta.to = 1;
 
@@ -777,7 +832,7 @@ describe("Admin servers index", function () {
     // Change sorting type and respond with 4 servers on 4 different pages
     cy.fixture("servers.json").then((servers) => {
       servers.data = servers.data.slice(0, 1);
-      servers.meta.last_page = 4;
+      servers.meta.last_page = 5;
       servers.meta.per_page = 1;
       servers.meta.to = 1;
 
@@ -813,7 +868,7 @@ describe("Admin servers index", function () {
       .should("include.text", "Server 01");
 
     // Check that pagination shows the correct number of pages
-    cy.get('[data-test="paginator-page"]').should("have.length", 4);
+    cy.get('[data-test="paginator-page"]').should("have.length", 5);
 
     // Check that correct pagination is active
     cy.get('[data-test="paginator-page"]')
@@ -825,7 +880,7 @@ describe("Admin servers index", function () {
       servers.data = servers.data.slice(1, 2);
       servers.meta.current_page = 2;
       servers.meta.from = 2;
-      servers.meta.last_page = 4;
+      servers.meta.last_page = 5;
       servers.meta.per_page = 1;
       servers.meta.to = 2;
 
@@ -866,7 +921,7 @@ describe("Admin servers index", function () {
     // Change sorting direction and make sure that the page is reset
     cy.fixture("servers.json").then((servers) => {
       servers.data = servers.data.slice(0, 1);
-      servers.meta.last_page = 4;
+      servers.meta.last_page = 5;
       servers.meta.per_page = 1;
       servers.meta.to = 1;
 
@@ -930,7 +985,7 @@ describe("Admin servers index", function () {
       servers.data = servers.data.slice(1, 2);
       servers.meta.current_page = 2;
       servers.meta.from = 2;
-      servers.meta.last_page = 4;
+      servers.meta.last_page = 5;
       servers.meta.per_page = 1;
       servers.meta.to = 2;
 
@@ -971,7 +1026,7 @@ describe("Admin servers index", function () {
     // Change sorting and make sure that the page is reset
     cy.fixture("servers.json").then((servers) => {
       servers.data = servers.data.slice(0, 1);
-      servers.meta.last_page = 4;
+      servers.meta.last_page = 5;
       servers.meta.per_page = 1;
       servers.meta.to = 1;
 
@@ -1068,7 +1123,7 @@ describe("Admin servers index", function () {
 
     cy.get('[data-test="servers-add-button"]').should("not.exist");
 
-    cy.get('[data-test="server-item"]').should("have.length", 4);
+    cy.get('[data-test="server-item"]').should("have.length", 5);
 
     cy.get('[data-test="server-item"]')
       .eq(0)
@@ -1131,7 +1186,7 @@ describe("Admin servers index", function () {
 
     cy.get('[data-test="servers-add-button"]').should("not.exist");
 
-    cy.get('[data-test="server-item"]').should("have.length", 4);
+    cy.get('[data-test="server-item"]').should("have.length", 5);
 
     cy.get('[data-test="server-item"]')
       .eq(0)
@@ -1213,7 +1268,7 @@ describe("Admin servers index", function () {
       .and("not.be.disabled")
       .and("have.attr", "href", "/admin/servers/new");
 
-    cy.get('[data-test="server-item"]').should("have.length", 4);
+    cy.get('[data-test="server-item"]').should("have.length", 5);
 
     cy.get('[data-test="server-item"]')
       .eq(0)
@@ -1295,7 +1350,7 @@ describe("Admin servers index", function () {
       .should("be.visible")
       .and("have.attr", "href", "/admin/servers/new");
 
-    cy.get('[data-test="server-item"]').should("have.length", 4);
+    cy.get('[data-test="server-item"]').should("have.length", 5);
 
     cy.get('[data-test="server-item"]')
       .eq(0)
diff --git a/tests/Frontend/e2e/AdminServersIndexServerActions.cy.js b/tests/Frontend/e2e/AdminServersIndexServerActions.cy.js
index fbc91ed41a..bae8d7d4b9 100644
--- a/tests/Frontend/e2e/AdminServersIndexServerActions.cy.js
+++ b/tests/Frontend/e2e/AdminServersIndexServerActions.cy.js
@@ -33,7 +33,7 @@ describe("Admin servers index server actions", function () {
     cy.visit("admin/servers");
     cy.wait("@serversRequest");
 
-    cy.get('[data-test="server-item"]').should("have.length", 4);
+    cy.get('[data-test="server-item"]').should("have.length", 5);
 
     cy.get('[data-test="servers-delete-dialog"]').should("not.exist");
 
@@ -61,10 +61,10 @@ describe("Admin servers index server actions", function () {
     );
 
     cy.fixture("servers.json").then((servers) => {
-      servers.data = servers.data.slice(0, 3);
-      servers.meta.to = 3;
-      servers.meta.total = 3;
-      servers.meta.total_no_filter = 3;
+      servers.data = servers.data.filter((server) => server.id !== 4);
+      servers.meta.to = 4;
+      servers.meta.total = 4;
+      servers.meta.total_no_filter = 4;
 
       cy.intercept("GET", "api/v1/servers*", {
         statusCode: 200,
@@ -89,7 +89,7 @@ describe("Admin servers index server actions", function () {
     cy.wait("@serversRequest");
 
     // Check that server was deleted
-    cy.get('[data-test="server-item"]').should("have.length", 3);
+    cy.get('[data-test="server-item"]').should("have.length", 4);
 
     // Check that dialog is closed
     cy.get('[data-test="servers-delete-dialog"]').should("not.exist");
@@ -119,7 +119,7 @@ describe("Admin servers index server actions", function () {
     cy.visit("admin/servers");
     cy.wait("@serversRequest");
 
-    cy.get('[data-test="server-item"]').should("have.length", 4);
+    cy.get('[data-test="server-item"]').should("have.length", 5);
 
     cy.get('[data-test="servers-delete-dialog"]').should("not.exist");
 
@@ -152,9 +152,9 @@ describe("Admin servers index server actions", function () {
     // Check 404 error
     cy.fixture("servers.json").then((servers) => {
       servers.data = servers.data.filter((server) => server.id !== 3);
-      servers.meta.to = 3;
-      servers.meta.total = 3;
-      servers.meta.total_no_filter = 3;
+      servers.meta.to = 4;
+      servers.meta.total = 4;
+      servers.meta.total_no_filter = 4;
 
       servers.data[2].status = -1;
 
@@ -188,7 +188,7 @@ describe("Admin servers index server actions", function () {
     ]);
 
     // Check that server is not in list anymore
-    cy.get('[data-test="server-item"]').should("have.length", 3);
+    cy.get('[data-test="server-item"]').should("have.length", 4);
 
     // Reopen dialog for different server
     cy.get('[data-test="server-item"]')
@@ -241,7 +241,7 @@ describe("Admin servers index server actions", function () {
       servers.data[0].meeting_count = 3;
       servers.data[0].participant_count = 50;
       servers.data[0].video_count = 6;
-      servers.meta.last_page = 4;
+      servers.meta.last_page = 5;
       servers.meta.per_page = 1;
       servers.meta.to = 1;
 
@@ -319,7 +319,7 @@ describe("Admin servers index server actions", function () {
       servers.data = servers.data.slice(1, 2);
       servers.meta.current_page = 2;
       servers.meta.from = 2;
-      servers.meta.last_page = 4;
+      servers.meta.last_page = 5;
       servers.meta.per_page = 1;
       servers.meta.to = 2;
 
@@ -352,7 +352,7 @@ describe("Admin servers index server actions", function () {
       });
 
     // Check that pagination shows the correct number of pages
-    cy.get('[data-test="paginator-page"]').should("have.length", 4);
+    cy.get('[data-test="paginator-page"]').should("have.length", 5);
 
     // Check that correct pagination is active
     cy.get('[data-test="paginator-page"]')
@@ -367,7 +367,7 @@ describe("Admin servers index server actions", function () {
       servers.data[0].video_count = 10;
       servers.meta.current_page = 2;
       servers.meta.from = 2;
-      servers.meta.last_page = 4;
+      servers.meta.last_page = 5;
       servers.meta.per_page = 1;
       servers.meta.to = 2;
 
@@ -398,7 +398,7 @@ describe("Admin servers index server actions", function () {
           .should("have.text", "10");
       });
 
-    cy.get('[data-test="paginator-page"]').should("have.length", 4);
+    cy.get('[data-test="paginator-page"]').should("have.length", 5);
 
     // Check that correct pagination is active
     cy.get('[data-test="paginator-page"]')
@@ -428,7 +428,7 @@ describe("Admin servers index server actions", function () {
           .should("have.text", "10");
       });
 
-    cy.get('[data-test="paginator-page"]').should("have.length", 4);
+    cy.get('[data-test="paginator-page"]').should("have.length", 5);
 
     // Check that correct pagination is active
     cy.get('[data-test="paginator-page"]')
diff --git a/tests/Frontend/e2e/AdminServersNew.cy.js b/tests/Frontend/e2e/AdminServersNew.cy.js
index c674e3234d..be5623c849 100644
--- a/tests/Frontend/e2e/AdminServersNew.cy.js
+++ b/tests/Frontend/e2e/AdminServersNew.cy.js
@@ -183,11 +183,11 @@ describe("Admin servers view", function () {
       "admin.servers.enabled",
     );
 
-    cy.get('[data-test="health-status-field"]')
+    cy.get('[data-test="connection-status-field"]')
       .should("be.visible")
       .and("include.text", "admin.servers.connection")
       .within(() => {
-        cy.get("#healthStatus")
+        cy.get("#connectionStatus")
           .should("have.value", "admin.servers.unknown")
           .and("be.disabled");
         cy.get('[data-test="servers-test-connection-button"]')
@@ -253,7 +253,7 @@ describe("Admin servers view", function () {
         cy.get(".p-select-label").should("have.attr", "aria-disabled", "true");
       });
 
-      cy.get("#healthStatus").and("be.disabled");
+      cy.get("#connectionStatus").and("be.disabled");
       cy.get('[data-test="servers-test-connection-button"]').should(
         "be.disabled",
       );
@@ -269,6 +269,7 @@ describe("Admin servers view", function () {
       expect(interception.request.body).to.eql({
         base_url: "https://localhost/bigbluebutton",
         description: "Testserver 01 for testing purposes",
+        connection_status_always_online: false,
         id: null,
         name: "Server 01",
         secret: "Secret123456789",
diff --git a/tests/Frontend/e2e/AdminServersView.cy.js b/tests/Frontend/e2e/AdminServersView.cy.js
index 0d055c16f7..07552cbe89 100644
--- a/tests/Frontend/e2e/AdminServersView.cy.js
+++ b/tests/Frontend/e2e/AdminServersView.cy.js
@@ -160,11 +160,11 @@ describe("Admin servers view", function () {
             );
           });
       });
-    cy.get('[data-test="health-status-field"]')
+    cy.get('[data-test="connection-status-field"]')
       .should("be.visible")
       .and("include.text", "admin.servers.connection")
       .within(() => {
-        cy.get("#healthStatus")
+        cy.get("#connectionStatus")
           .should("have.value", "admin.servers.online")
           .and("be.disabled");
         cy.get('[data-test="servers-test-connection-button"]')
@@ -244,11 +244,11 @@ describe("Admin servers view", function () {
             );
           });
       });
-    cy.get('[data-test="health-status-field"]')
+    cy.get('[data-test="connection-status-field"]')
       .should("be.visible")
       .and("include.text", "admin.servers.connection")
       .within(() => {
-        cy.get("#healthStatus")
+        cy.get("#connectionStatus")
           .should("have.value", "admin.servers.online")
           .and("be.disabled");
         cy.get('[data-test="servers-test-connection-button"]')
@@ -270,7 +270,7 @@ describe("Admin servers view", function () {
   it("check serverView shown correctly (server disabled)", function () {
     cy.fixture("server.json").then((server) => {
       server.data.status = -1;
-      server.data.health = 0;
+      server.data.connection_status = null;
 
       cy.intercept("GET", "api/v1/servers/1", {
         statusCode: 200,
@@ -304,12 +304,12 @@ describe("Admin servers view", function () {
           });
       });
 
-    cy.get('[data-test="health-status-field"]')
+    cy.get('[data-test="connection-status-field"]')
       .should("be.visible")
       .and("include.text", "admin.servers.connection")
       .within(() => {
-        cy.get("#healthStatus")
-          .should("have.value", "admin.servers.unhealthy")
+        cy.get("#connectionStatus")
+          .should("have.value", "admin.servers.unknown")
           .and("be.disabled");
         cy.get('[data-test="servers-test-connection-button"]')
           .should("be.visible")
@@ -329,6 +329,55 @@ describe("Admin servers view", function () {
     cy.get('[data-test="servers-panic-button"]').should("not.exist");
   });
 
+  it("check serverView shown correctly (server connection status always online)", function () {
+    cy.intercept("GET", "api/v1/servers/1", { fixture: "server.json" }).as(
+      "serverRequest",
+    );
+
+    cy.visit("/admin/servers/1");
+    cy.wait("@serverRequest");
+
+    // Check connection status always online field is not checked
+    cy.get('[data-test="connection-status-always-online-field"]')
+      .should("be.visible")
+      .and("include.text", "admin.servers.connection_status_always_online")
+      .and(
+        "include.text",
+        "admin.servers.connection_status_always_online_description",
+      )
+      .within(() => {
+        cy.get("#connection-status-always-online")
+          .should("not.be.checked")
+          .and("be.disabled");
+      });
+
+    cy.fixture("server.json").then((server) => {
+      server.data.connection_status_always_online = true;
+
+      cy.intercept("GET", "api/v1/servers/1", {
+        statusCode: 200,
+        body: server,
+      }).as("serverRequest");
+    });
+
+    cy.reload();
+    cy.wait("@serverRequest");
+
+    // Check connection status always online field is checked
+    cy.get('[data-test="connection-status-always-online-field"]')
+      .should("be.visible")
+      .and("include.text", "admin.servers.connection_status_always_online")
+      .and(
+        "include.text",
+        "admin.servers.connection_status_always_online_description",
+      )
+      .within(() => {
+        cy.get("#connection-status-always-online")
+          .should("be.checked")
+          .and("be.disabled");
+      });
+  });
+
   it("check button visibility with update permission", function () {
     cy.fixture("currentUser.json").then((currentUser) => {
       currentUser.data.permissions = [
diff --git a/tests/Frontend/e2e/AdminServersViewServerActions.cy.js b/tests/Frontend/e2e/AdminServersViewServerActions.cy.js
index b447023844..25f64573a4 100644
--- a/tests/Frontend/e2e/AdminServersViewServerActions.cy.js
+++ b/tests/Frontend/e2e/AdminServersViewServerActions.cy.js
@@ -186,7 +186,7 @@ describe("Admin servers view server actions", function () {
     cy.visit("/admin/servers/1");
     cy.wait("@serverRequest");
 
-    cy.get("#healthStatus")
+    cy.get("#connectionStatus")
       .should("have.value", "admin.servers.online")
       .and("be.disabled");
 
@@ -230,11 +230,11 @@ describe("Admin servers view server actions", function () {
     );
 
     // Check that connection status is updated
-    cy.get("#healthStatus")
+    cy.get("#connectionStatus")
       .should("have.value", "admin.servers.offline")
       .and("be.disabled");
 
-    cy.get('[data-test="health-status-field"]').should(
+    cy.get('[data-test="connection-status-field"]').should(
       "include.text",
       "admin.servers.offline_reason.connection",
     );
@@ -258,11 +258,11 @@ describe("Admin servers view server actions", function () {
     });
 
     // Check that connection status is updated
-    cy.get("#healthStatus")
+    cy.get("#connectionStatus")
       .should("have.value", "admin.servers.offline")
       .and("be.disabled");
 
-    cy.get('[data-test="health-status-field"]').should(
+    cy.get('[data-test="connection-status-field"]').should(
       "include.text",
       "admin.servers.offline_reason.secret",
     );
@@ -286,11 +286,11 @@ describe("Admin servers view server actions", function () {
     });
 
     // Check that connection status is updated
-    cy.get("#healthStatus")
+    cy.get("#connectionStatus")
       .should("have.value", "admin.servers.online")
       .and("be.disabled");
 
-    cy.get('[data-test="health-status-field"]').should(
+    cy.get('[data-test="connection-status-field"]').should(
       "not.include.text",
       "admin.servers.offline_reason",
     );
@@ -300,7 +300,7 @@ describe("Admin servers view server actions", function () {
     cy.visit("/admin/servers/1");
     cy.wait("@serverRequest");
 
-    cy.get("#healthStatus")
+    cy.get("#connectionStatus")
       .should("have.value", "admin.servers.online")
       .and("be.disabled");
 
@@ -317,7 +317,7 @@ describe("Admin servers view server actions", function () {
     cy.wait("@checkConnectionRequest");
 
     // Check that connection status is updated
-    cy.get("#healthStatus")
+    cy.get("#connectionStatus")
       .should("have.value", "admin.servers.unknown")
       .and("be.disabled");
 
@@ -362,7 +362,7 @@ describe("Admin servers view server actions", function () {
 
     cy.fixture("server.json").then((server) => {
       server.data.status = -1;
-      server.data.health = null;
+      server.data.connection_status = null;
       server.data.participant_count = null;
       server.data.listener_count = null;
       server.data.voice_participant_count = null;
@@ -400,8 +400,8 @@ describe("Admin servers view server actions", function () {
       "admin.servers.disabled",
     );
 
-    // Check that server health is updated
-    cy.get("#healthStatus")
+    // Check that server connection status is updated
+    cy.get("#connectionStatus")
       .should("have.value", "admin.servers.unknown")
       .and("be.disabled");
 
diff --git a/tests/Frontend/fixtures/server.json b/tests/Frontend/fixtures/server.json
index 257ee832b1..d8eadb51d0 100644
--- a/tests/Frontend/fixtures/server.json
+++ b/tests/Frontend/fixtures/server.json
@@ -6,8 +6,9 @@
     "base_url": "https://localhost/bigbluebutton",
     "secret": "123456789",
     "strength": 2,
+    "connection_status_always_online": false,
     "status": 1,
-    "health": 1,
+    "connection_status": 1,
     "participant_count": 14,
     "listener_count": 7,
     "voice_participant_count": 7,
diff --git a/tests/Frontend/fixtures/servers.json b/tests/Frontend/fixtures/servers.json
index 79cde5db5b..a400963a51 100644
--- a/tests/Frontend/fixtures/servers.json
+++ b/tests/Frontend/fixtures/servers.json
@@ -5,8 +5,9 @@
       "name": "Server 01",
       "description": "Testserver 01",
       "strength": 1,
+      "connection_status_always_online": false,
       "status": 1,
-      "health": 1,
+      "connection_status": 1,
       "participant_count": 10,
       "listener_count": 5,
       "voice_participant_count": 5,
@@ -22,8 +23,9 @@
       "name": "Server 02",
       "description": "Testserver 02",
       "strength": 1,
+      "connection_status_always_online": false,
       "status": 1,
-      "health": 0,
+      "connection_status": 0,
       "participant_count": 50,
       "listener_count": 25,
       "voice_participant_count": 30,
@@ -39,8 +41,9 @@
       "name": "Server 03",
       "description": "Testserver 03",
       "strength": 1,
+      "connection_status_always_online": false,
       "status": -1,
-      "health": -1,
+      "connection_status": null,
       "participant_count": null,
       "listener_count": null,
       "voice_participant_count": null,
@@ -56,8 +59,27 @@
       "name": "Server 04",
       "description": "Testserver 04",
       "strength": 1,
+      "connection_status_always_online": false,
       "status": 0,
-      "health": 1,
+      "connection_status": -1,
+      "participant_count": null,
+      "listener_count": null,
+      "voice_participant_count": null,
+      "video_count": null,
+      "meeting_count": null,
+      "own_meeting_count": null,
+      "version": null,
+      "model_name": "Server",
+      "updated_at": "2020-12-21T13:43:21.000000Z"
+    },
+    {
+      "id": 5,
+      "name": "Server 05",
+      "description": "Testserver 05",
+      "strength": 1,
+      "connection_status_always_online": true,
+      "status": 1,
+      "connection_status": 1,
       "participant_count": null,
       "listener_count": null,
       "voice_participant_count": null,
@@ -74,8 +96,8 @@
     "from": 1,
     "last_page": 1,
     "per_page": 15,
-    "to": 4,
-    "total": 4,
-    "total_no_filter": 4
+    "to": 5,
+    "total": 5,
+    "total_no_filter": 5
   }
 }