--- servers/xmlrpc_server/xmlrpc_server.module
+++ servers/xmlrpc_server/xmlrpc_server.module
@@ -39,20 +39,7 @@ function xmlrpc_server_server() {
 function xmlrpc_server_xmlrpc() {
   $callbacks = array();
 
-  $endpoints = services_endpoint_load_all();
-
-  $current_endpoint = NULL;
-  foreach ($endpoints as $endpoint) {
-    if ($endpoint->path == $_GET['q']) {
-      $current_endpoint = $endpoint;
-    }
-  }
-
-  if (empty($current_endpoint)) {
-    array();
-  }
-
-  $resources = services_get_resources($current_endpoint->name);
+  $resources = services_get_resources(services_get_server_info('endpoint', ''));
   if (!empty($resources)) {
     // Translate all resources
     foreach ($resources as $name => $def) {