diff --git a/app/Jobs/CheckTraefikVersionJob.php b/app/Jobs/CheckTraefikVersionJob.php
index 925c8ba7d..cb4c94695 100644
--- a/app/Jobs/CheckTraefikVersionJob.php
+++ b/app/Jobs/CheckTraefikVersionJob.php
@@ -47,10 +47,10 @@ public function handle(): void
 
             // Query all servers with Traefik proxy that are reachable
             $servers = Server::whereNotNull('proxy')
+                ->whereProxyType(ProxyTypes::TRAEFIK->value)
                 ->whereRelation('settings', 'is_reachable', true)
                 ->whereRelation('settings', 'is_usable', true)
-                ->get()
-                ->filter(fn ($server) => $server->proxyType() === ProxyTypes::TRAEFIK->value);
+                ->get();
 
             $serverCount = $servers->count();
             Log::info("CheckTraefikVersionJob: Found {$serverCount} server(s) with Traefik proxy");
diff --git a/app/Models/Server.php b/app/Models/Server.php
index 52dcce44f..157666d66 100644
--- a/app/Models/Server.php
+++ b/app/Models/Server.php
@@ -523,6 +523,11 @@ public function scopeWithProxy(): Builder
         return $this->proxy->modelScope();
     }
 
+    public function scopeWhereProxyType(Builder $query, string $proxyType): Builder
+    {
+        return $query->where('proxy->type', $proxyType);
+    }
+
     public function isLocalhost()
     {
         return $this->ip === 'host.docker.internal' || $this->id === 0;
diff --git a/tests/Unit/ServerQueryScopeTest.php b/tests/Unit/ServerQueryScopeTest.php
new file mode 100644
index 000000000..8ab0b8b10
--- /dev/null
+++ b/tests/Unit/ServerQueryScopeTest.php
@@ -0,0 +1,62 @@
+<?php
+
+use App\Enums\ProxyTypes;
+use App\Models\Server;
+use Illuminate\Database\Eloquent\Builder;
+use Mockery;
+
+it('filters servers by proxy type using whereProxyType scope', function () {
+    // Mock the Builder
+    $mockBuilder = Mockery::mock(Builder::class);
+
+    // Expect the where method to be called with the correct parameters
+    $mockBuilder->shouldReceive('where')
+        ->once()
+        ->with('proxy->type', ProxyTypes::TRAEFIK->value)
+        ->andReturnSelf();
+
+    // Create a server instance and call the scope
+    $server = new Server;
+    $result = $server->scopeWhereProxyType($mockBuilder, ProxyTypes::TRAEFIK->value);
+
+    // Assert the builder is returned
+    expect($result)->toBe($mockBuilder);
+});
+
+it('can chain whereProxyType scope with other query methods', function () {
+    // Mock the Builder
+    $mockBuilder = Mockery::mock(Builder::class);
+
+    // Expect multiple chained calls
+    $mockBuilder->shouldReceive('where')
+        ->once()
+        ->with('proxy->type', ProxyTypes::CADDY->value)
+        ->andReturnSelf();
+
+    // Create a server instance and call the scope
+    $server = new Server;
+    $result = $server->scopeWhereProxyType($mockBuilder, ProxyTypes::CADDY->value);
+
+    // Assert the builder is returned for chaining
+    expect($result)->toBe($mockBuilder);
+});
+
+it('accepts any proxy type string value', function () {
+    // Mock the Builder
+    $mockBuilder = Mockery::mock(Builder::class);
+
+    // Test with a custom proxy type
+    $customProxyType = 'custom-proxy';
+
+    $mockBuilder->shouldReceive('where')
+        ->once()
+        ->with('proxy->type', $customProxyType)
+        ->andReturnSelf();
+
+    // Create a server instance and call the scope
+    $server = new Server;
+    $result = $server->scopeWhereProxyType($mockBuilder, $customProxyType);
+
+    // Assert the builder is returned
+    expect($result)->toBe($mockBuilder);
+});