diff --git a/services.install b/services.install
index e3b548c..c2b7a25 100644
--- a/services.install
+++ b/services.install
@@ -119,14 +119,14 @@ function services_requirements($phase) {
   // Warn users of the possible threat.
   if ($phase == 'runtime') {
     //Pull endpoints that do not have services authentication enabled
-    $result = db_select('services_endpoint', 'se')
-      ->condition('se.authentication', '%services%', 'NOT LIKE')
-      ->fields('se')
-      ->execute();
+    module_load_include('module', 'services');
+    $endpoints = services_endpoint_load_all();
     $items = array();
     // Build our items array
-    foreach ($result as $endpoint) {
-      $items[] = l($endpoint->name, 'admin/structure/services/list/'. $endpoint->name .'/edit');
+    foreach ($endpoints as $endpoint) {
+      if (empty($endpoint->disabled) && empty($endpoint->authentication)) {
+        $items[] = l($endpoint->name, 'admin/structure/services/list/' . $endpoint->name . '/edit');
+      }
     }
     // theme the endpoints list
     $endpoints = '';