diff --git servers/xmlrpc_server/xmlrpc_server.module servers/xmlrpc_server/xmlrpc_server.module
index b51025c..b468a46 100644
--- servers/xmlrpc_server/xmlrpc_server.module
+++ servers/xmlrpc_server/xmlrpc_server.module
@@ -37,8 +37,21 @@ function xmlrpc_server_server() {
  */
 function xmlrpc_server_xmlrpc() {
   $callbacks = array();
-  
-  $resources = services_get_resources();
+
+  $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);
   if (!empty($resources)) {
     // Translate all resources
     foreach ($resources as $name => $def) {