diff --git a/core/lib/Drupal/Core/Entity/Query/QueryFactory.php b/core/lib/Drupal/Core/Entity/Query/QueryFactory.php
index 0005346..5cfda2b 100644
--- a/core/lib/Drupal/Core/Entity/Query/QueryFactory.php
+++ b/core/lib/Drupal/Core/Entity/Query/QueryFactory.php
@@ -57,8 +57,7 @@ public function __construct(EntityManagerInterface $entity_manager) {
    *   The query object that can query the given entity type.
    */
   public function get($entity_type_id, $conjunction = 'AND') {
-    $service_name = $this->entityManager->getStorage($entity_type_id)->getQueryServiceName();
-    return $this->container->get($service_name)->get($this->entityManager->getDefinition($entity_type_id), $conjunction);
+    return $this->entityManager->getStorage($entity_type_id)->getQuery($conjunction);
   }
 
   /**