diff --git a/src/Form/ServerForm.php b/src/Form/ServerForm.php
index b4e50262..2361539e 100644
--- a/src/Form/ServerForm.php
+++ b/src/Form/ServerForm.php
@@ -20,13 +20,6 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
 class ServerForm extends EntityForm {
 
   /**
-   * The server storage controller.
-   *
-   * @var \Drupal\Core\Entity\EntityStorageInterface
-   */
-  protected $storage;
-
-  /**
    * The backend plugin manager.
    *
    * @var \Drupal\search_api\Backend\BackendPluginManager
@@ -36,13 +29,10 @@ class ServerForm extends EntityForm {
   /**
    * Constructs a ServerForm object.
    *
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
-   *   The entity type manager.
    * @param \Drupal\search_api\Backend\BackendPluginManager $backend_plugin_manager
    *   The backend plugin manager.
    */
   public function __construct(EntityTypeManagerInterface $entity_type_manager, BackendPluginManager $backend_plugin_manager) {
-    $this->storage = $entity_type_manager->getStorage('search_api_server');
     $this->backendPluginManager = $backend_plugin_manager;
   }
 
@@ -117,7 +107,7 @@ class ServerForm extends EntityForm {
       '#maxlength' => 50,
       '#required' => TRUE,
       '#machine_name' => [
-        'exists' => [$this->storage, 'load'],
+        'exists' => ['\Drupal\search_api\Entity\Server::load'],
         'source' => ['name'],
       ],
       '#disabled' => !$server->isNew(),