diff --git a/includes/discovery/services.inc.php b/includes/discovery/services.inc.php
index 56b5ffab31..f280bc0a97 100644
--- a/includes/discovery/services.inc.php
+++ b/includes/discovery/services.inc.php
@@ -30,10 +30,8 @@ if (Config::get('discover_services')) {
             }
         }
     }
-    foreach (dbFetchRows('SELECT `service_template_id` FROM `services_template`') as $service_template) {
-        foreach (dbFetchRows('SELECT `id` FROM `device_groups`') as $device_group) {
-            discover_service_template($device_group['id'], $service_template['service_template_id']);
-        }
+    foreach (dbFetchRows('SELECT `service_template_id`, `device_group_id` FROM `services_template`') as $service_template) {
+        discover_service_template($service_template['device_group_id'], $service_template['service_template_id']);
     }
     echo "\n";
 }