diff --git a/entityreference_autocomplete.module b/entityreference_autocomplete.module
index 50a1f7d..fbe3a77 100644
--- a/entityreference_autocomplete.module
+++ b/entityreference_autocomplete.module
@@ -145,6 +145,14 @@ function entityreference_autocomplete_process_entityreference($element, &$form_s
     $query_settings = array_merge($element_info['entityreference']['#era_query_settings'], $element['#era_query_settings']);
     $autocomplete_path .= '/' . urlencode(http_build_query($query_settings));
     $element['#autocomplete_path'] = $autocomplete_path;
+
+    // Since Drupal core 7.39, additional processing is necessary for
+    // autocomplete text fields. See https://www.drupal.org/node/2561431
+    // In prior versions of Drupal core, form_process_autocomplete() is not
+    // available.
+    if (function_exists('form_process_autocomplete')) {
+      $element = form_process_autocomplete($element);
+    }
   }
   return $element;
 }