diff --git a/src/Form/CorrespondingReferenceForm.php b/src/Form/CorrespondingReferenceForm.php
--- a/src/Form/CorrespondingReferenceForm.php
+++ b/src/Form/CorrespondingReferenceForm.php
@@ -5,8 +5,8 @@
 use Drupal\Core\Entity\EntityFieldManager;
 use Drupal\Core\Entity\EntityForm;
 use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Entity\EntityWithPluginCollectionInterface;
-use Drupal\Core\Entity\Query\QueryFactory;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\cer\Entity\CorrespondingReferenceInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -16,8 +16,8 @@
  */
 class CorrespondingReferenceForm extends EntityForm {

-  /** @var \Drupal\Core\Entity\Query\QueryFactory */
-  protected $entityQuery;
+  /** @var EntityTypeManagerInterface */
+  protected $entityTypeManager;

   /** @var  EntityFieldManager */
   protected $fieldManager;
@@ -25,14 +25,12 @@
   /**
    * Constructs a CorrespondingReferenceForm object.
    *
-   * @param \Drupal\Core\Entity\Query\QueryFactory $entity_query
-   *   The entity query.
-   *
+   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
    * @param \Drupal\Core\Entity\EntityFieldManager $field_manager
    *   The entity field manager.
    */
-  public function __construct(QueryFactory $entity_query, EntityFieldManager $field_manager) {
-    $this->entityQuery = $entity_query;
+  public function __construct(EntityTypeManagerInterface $entity_type_manager, EntityFieldManager $field_manager) {
+    $this->entityTypeManager = $entity_type_manager;
     $this->fieldManager = $field_manager;
   }

@@ -40,14 +38,14 @@
    * {@inheritdoc}
    */
   public static function create(ContainerInterface $container) {
-    /** @var QueryFactory $entity_query */
-    $entity_query = $container->get('entity.query');
+    /** @var EntityTypeManagerInterface $entity_query */
+    $entity_type_manager = $container->get('entity_type.manager');

     /** @var EntityFieldManager $field_manager */
     $field_manager = $container->get('entity_field.manager');

     return new static(
-      $entity_query,
+      $entity_type_manager,
       $field_manager
     );
   }
@@ -143,7 +141,8 @@
    * Helper function to check whether a corresponding reference configuration entity exists.
    */
   public function exists($id) {
-    $entity = $this->entityQuery->get('corresponding_reference')
+    $entity = $this->entityTypeManager->getStorage('corresponding_reference')
+      ->getQuery()
       ->condition('id', $id)
       ->execute();
     return (bool) $entity;