diff --git a/app/Http/Controllers/Server/ServerController.php b/app/Http/Controllers/Server/ServerController.php
index c9f70c350..c60196948 100644
--- a/app/Http/Controllers/Server/ServerController.php
+++ b/app/Http/Controllers/Server/ServerController.php
@@ -204,7 +204,8 @@ class ServerController extends Controller
                 'service_variables.*',
                 DB::raw('COALESCE(server_variables.variable_value, service_variables.default_value) as a_serverValue')
             )->leftJoin('server_variables', 'server_variables.variable_id', '=', 'service_variables.id')
-            ->where('option_id', $server->option)
+            ->where('service_variables.option_id', $server->option)
+            ->where('server_variables.server_id', $server->id)
             ->get();
 
         $service = Models\Service::select(