diff --git a/app/Jobs/Ookla/SelectSpeedtestServerJob.php b/app/Jobs/Ookla/SelectSpeedtestServerJob.php
index 6ba7832a7..c788e1f74 100644
--- a/app/Jobs/Ookla/SelectSpeedtestServerJob.php
+++ b/app/Jobs/Ookla/SelectSpeedtestServerJob.php
@@ -43,8 +43,9 @@ public function handle(): void
             return;
         }
 
-        // If preferred servers are set in the config, we can use that.
-        if (! blank(config('speedtest.servers'))) {
+        // If preferred servers are set in the config, we can use that,
+        // but only if the test is scheduled.
+        if ($this->result->scheduled && ! blank(config('speedtest.servers'))) {
             $this->updateServerId(
                 result: $this->result,
                 serverId: $this->getConfigServer(),
diff --git a/app/Livewire/Topbar/RunSpeedtestAction.php b/app/Livewire/Topbar/RunSpeedtestAction.php
index e1b0ee5c6..03b6a910d 100644
--- a/app/Livewire/Topbar/RunSpeedtestAction.php
+++ b/app/Livewire/Topbar/RunSpeedtestAction.php
@@ -39,7 +39,7 @@ public function speedtestAction(): Action
             ->form([
                 Select::make('server_id')
                     ->label('Select Server')
-                    ->helperText('Leave empty to run the speedtest without specifying a server.')
+                    ->helperText('Leave empty to run the speedtest without specifying a server. Blocked servers will be skipped.')
                     ->options(function (): array {
                         return array_filter([
                             'Manual servers' => Ookla::getConfigServers(),