diff --git a/app/Listeners/Discord/SendSpeedtestCompletedNotification.php b/app/Listeners/Discord/SendSpeedtestCompletedNotification.php
index 3beb7db0e..b6e5a484b 100644
--- a/app/Listeners/Discord/SendSpeedtestCompletedNotification.php
+++ b/app/Listeners/Discord/SendSpeedtestCompletedNotification.php
@@ -35,7 +35,7 @@ public function handle(SpeedtestCompleted $event): void
         $payload = [
             'content' => view('discord.speedtest-completed', [
                 'id' => $event->result->id,
-                'service' => Str::title($event->result->service),
+                'service' => Str::title($event->result->service->getLabel()),
                 'serverName' => $event->result->server_name,
                 'serverId' => $event->result->server_id,
                 'isp' => $event->result->isp,
diff --git a/app/Listeners/Discord/SendSpeedtestThresholdNotification.php b/app/Listeners/Discord/SendSpeedtestThresholdNotification.php
index 87db85df6..50dd18411 100644
--- a/app/Listeners/Discord/SendSpeedtestThresholdNotification.php
+++ b/app/Listeners/Discord/SendSpeedtestThresholdNotification.php
@@ -64,7 +64,7 @@ public function handle(SpeedtestCompleted $event): void
         $payload = [
             'content' => view('discord.speedtest-threshold', [
                 'id' => $event->result->id,
-                'service' => Str::title($event->result->service),
+                'service' => Str::title($event->result->service->getLabel()),
                 'serverName' => $event->result->server_name,
                 'serverId' => $event->result->server_id,
                 'isp' => $event->result->isp,
diff --git a/app/Listeners/Gotify/SendSpeedtestCompletedNotification.php b/app/Listeners/Gotify/SendSpeedtestCompletedNotification.php
index 92eb44993..13f3d2cb8 100644
--- a/app/Listeners/Gotify/SendSpeedtestCompletedNotification.php
+++ b/app/Listeners/Gotify/SendSpeedtestCompletedNotification.php
@@ -35,7 +35,7 @@ public function handle(SpeedtestCompleted $event): void
         $payload = [
             'message' => view('gotify.speedtest-completed', [
                 'id' => $event->result->id,
-                'service' => Str::title($event->result->service),
+                'service' => Str::title($event->result->service->getLabel()),
                 'serverName' => $event->result->server_name,
                 'serverId' => $event->result->server_id,
                 'isp' => $event->result->isp,
diff --git a/app/Listeners/Gotify/SendSpeedtestThresholdNotification.php b/app/Listeners/Gotify/SendSpeedtestThresholdNotification.php
index 6fd95cb55..690f565e7 100644
--- a/app/Listeners/Gotify/SendSpeedtestThresholdNotification.php
+++ b/app/Listeners/Gotify/SendSpeedtestThresholdNotification.php
@@ -64,7 +64,7 @@ public function handle(SpeedtestCompleted $event): void
         $payload = [
             'message' => view('gotify.speedtest-threshold', [
                 'id' => $event->result->id,
-                'service' => Str::title($event->result->service),
+                'service' => Str::title($event->result->service->getLabel()),
                 'serverName' => $event->result->server_name,
                 'serverId' => $event->result->server_id,
                 'isp' => $event->result->isp,
diff --git a/app/Listeners/Ntfy/SendSpeedtestCompletedNotification.php b/app/Listeners/Ntfy/SendSpeedtestCompletedNotification.php
index 138031fc9..08052c0e5 100644
--- a/app/Listeners/Ntfy/SendSpeedtestCompletedNotification.php
+++ b/app/Listeners/Ntfy/SendSpeedtestCompletedNotification.php
@@ -35,7 +35,7 @@ public function handle(SpeedtestCompleted $event): void
         $payload =
              view('ntfy.speedtest-completed', [
                  'id' => $event->result->id,
-                 'service' => Str::title($event->result->service),
+                 'service' => Str::title($event->result->service->getLabel()),
                  'serverName' => $event->result->server_name,
                  'serverId' => $event->result->server_id,
                  'isp' => $event->result->isp,
diff --git a/app/Listeners/Ntfy/SendSpeedtestThresholdNotification.php b/app/Listeners/Ntfy/SendSpeedtestThresholdNotification.php
index 57d0da0ed..67ed5312a 100644
--- a/app/Listeners/Ntfy/SendSpeedtestThresholdNotification.php
+++ b/app/Listeners/Ntfy/SendSpeedtestThresholdNotification.php
@@ -64,7 +64,7 @@ public function handle(SpeedtestCompleted $event): void
         $payload =
             view('ntfy.speedtest-threshold', [
                 'id' => $event->result->id,
-                'service' => Str::title($event->result->service),
+                'service' => Str::title($event->result->service->getLabel()),
                 'serverName' => $event->result->server_name,
                 'serverId' => $event->result->server_id,
                 'isp' => $event->result->isp,
diff --git a/app/Listeners/Pushover/SendSpeedtestCompletedNotification.php b/app/Listeners/Pushover/SendSpeedtestCompletedNotification.php
index 27c8aeb5d..c7e55d000 100644
--- a/app/Listeners/Pushover/SendSpeedtestCompletedNotification.php
+++ b/app/Listeners/Pushover/SendSpeedtestCompletedNotification.php
@@ -35,7 +35,7 @@ public function handle(SpeedtestCompleted $event): void
         $payload = [
             view('pushover.speedtest-completed', [
                 'id' => $event->result->id,
-                'service' => Str::title($event->result->service),
+                'service' => Str::title($event->result->service->getLabel()),
                 'serverName' => $event->result->server_name,
                 'serverId' => $event->result->server_id,
                 'isp' => $event->result->isp,
diff --git a/app/Listeners/Pushover/SendSpeedtestThresholdNotification.php b/app/Listeners/Pushover/SendSpeedtestThresholdNotification.php
index ae57af36f..52b964c7b 100644
--- a/app/Listeners/Pushover/SendSpeedtestThresholdNotification.php
+++ b/app/Listeners/Pushover/SendSpeedtestThresholdNotification.php
@@ -64,7 +64,7 @@ public function handle(SpeedtestCompleted $event): void
         $payload = [
             view('pushover.speedtest-threshold', [
                 'id' => $event->result->id,
-                'service' => Str::title($event->result->service),
+                'service' => Str::title($event->result->service->getLabel()),
                 'serverName' => $event->result->server_name,
                 'serverId' => $event->result->server_id,
                 'isp' => $event->result->isp,
diff --git a/app/Listeners/Slack/SendSpeedtestCompletedNotification.php b/app/Listeners/Slack/SendSpeedtestCompletedNotification.php
index fb49a6746..54d7439a0 100644
--- a/app/Listeners/Slack/SendSpeedtestCompletedNotification.php
+++ b/app/Listeners/Slack/SendSpeedtestCompletedNotification.php
@@ -35,7 +35,7 @@ public function handle(SpeedtestCompleted $event): void
         $payload = [
             'text' => view('slack.speedtest-completed', [
                 'id' => $event->result->id,
-                'service' => Str::title($event->result->service),
+                'service' => Str::title($event->result->service->getLabel()),
                 'serverName' => $event->result->server_name,
                 'serverId' => $event->result->server_id,
                 'isp' => $event->result->isp,
diff --git a/app/Listeners/Slack/SendSpeedtestThresholdNotification.php b/app/Listeners/Slack/SendSpeedtestThresholdNotification.php
index ac6a6d5b4..d5f6a748d 100644
--- a/app/Listeners/Slack/SendSpeedtestThresholdNotification.php
+++ b/app/Listeners/Slack/SendSpeedtestThresholdNotification.php
@@ -64,7 +64,7 @@ public function handle(SpeedtestCompleted $event): void
         $payload = [
             'text' => view('slack.speedtest-threshold', [
                 'id' => $event->result->id,
-                'service' => Str::title($event->result->service),
+                'service' => Str::title($event->result->service->getLabel()),
                 'serverName' => $event->result->server_name,
                 'serverId' => $event->result->server_id,
                 'isp' => $event->result->isp,
diff --git a/app/Listeners/Telegram/SendSpeedtestCompletedNotification.php b/app/Listeners/Telegram/SendSpeedtestCompletedNotification.php
index 309bd8744..ee269799c 100644
--- a/app/Listeners/Telegram/SendSpeedtestCompletedNotification.php
+++ b/app/Listeners/Telegram/SendSpeedtestCompletedNotification.php
@@ -35,7 +35,7 @@ public function handle(SpeedtestCompleted $event): void
 
         $content = view('telegram.speedtest-completed', [
             'id' => $event->result->id,
-            'service' => Str::title($event->result->service),
+            'service' => Str::title($event->result->service->getLabel()),
             'serverName' => $event->result->server_name,
             'serverId' => $event->result->server_id,
             'isp' => $event->result->isp,
diff --git a/app/Listeners/Telegram/SendSpeedtestThresholdNotification.php b/app/Listeners/Telegram/SendSpeedtestThresholdNotification.php
index f79b100b3..dcb4aa87d 100644
--- a/app/Listeners/Telegram/SendSpeedtestThresholdNotification.php
+++ b/app/Listeners/Telegram/SendSpeedtestThresholdNotification.php
@@ -64,7 +64,7 @@ public function handle(SpeedtestCompleted $event): void
 
         $content = view('telegram.speedtest-threshold', [
             'id' => $event->result->id,
-            'service' => Str::title($event->result->service),
+            'service' => Str::title($event->result->service->getLabel()),
             'serverName' => $event->result->server_name,
             'serverId' => $event->result->server_id,
             'isp' => $event->result->isp,
diff --git a/app/Mail/SpeedtestCompletedMail.php b/app/Mail/SpeedtestCompletedMail.php
index c6d43bfc3..6f7295771 100644
--- a/app/Mail/SpeedtestCompletedMail.php
+++ b/app/Mail/SpeedtestCompletedMail.php
@@ -44,7 +44,7 @@ public function content(): Content
             markdown: 'emails.speedtest-completed',
             with: [
                 'id' => $this->result->id,
-                'service' => Str::title($this->result->service),
+                'service' => Str::title($this->result->service->getLabel()),
                 'serverName' => $this->result->server_name,
                 'serverId' => $this->result->server_id,
                 'isp' => $this->result->isp,
diff --git a/app/Mail/SpeedtestThresholdMail.php b/app/Mail/SpeedtestThresholdMail.php
index 038709e90..94ad14af9 100644
--- a/app/Mail/SpeedtestThresholdMail.php
+++ b/app/Mail/SpeedtestThresholdMail.php
@@ -44,7 +44,7 @@ public function content(): Content
             markdown: 'emails.speedtest-threshold',
             with: [
                 'id' => $this->result->id,
-                'service' => Str::title($this->result->service),
+                'service' => Str::title($this->result->service->getLabel()),
                 'serverName' => $this->result->server_name,
                 'serverId' => $this->result->server_id,
                 'isp' => $this->result->isp,