diff --git a/plugins/export_ui/services_ctools_export_ui.class.php b/plugins/export_ui/services_ctools_export_ui.class.php
index 5fcbc25..cd4c501 100644
--- a/plugins/export_ui/services_ctools_export_ui.class.php
+++ b/plugins/export_ui/services_ctools_export_ui.class.php
@@ -374,7 +374,7 @@ function services_edit_form_endpoint_resources($form, &$form_state, $endpoint) {
               'resource_api_version' => array(
                 '#type' => 'select',
                 '#options' => $options,
-                '#default_value' => $default_api_value,
+                '#default_value' => $resource_conf[$class][$op_name]['settings']['services']['resource_api_version'],
                 '#title' => 'Resource API Version',
               ),
             );
diff --git a/services.module b/services.module
index 4e173d0..9a4443c 100644
--- a/services.module
+++ b/services.module
@@ -799,7 +799,7 @@ function services_get_resource_api_version($endpoint, $resource, $method) {
   if (isset($endpoint->resources[$resource]) ) {
     $class_info = services_operation_class_info();
     foreach ($class_info as $class_name => $class) {
-      if (!empty($resource[$class_name])) {
+        if (!empty($endpoint->resources[$resource][$class_name])) {
         if (isset($endpoint->resources[$resource][$class_name][$method]['settings']['services']['resource_api_version'])) {
           if($version = _services_version_header_options()) {
             $split = explode('.', $version);