diff --git a/src/Controller/ConfigPagesController.php b/src/Controller/ConfigPagesController.php
index c1c31d2..f829c43 100644
--- a/src/Controller/ConfigPagesController.php
+++ b/src/Controller/ConfigPagesController.php
@@ -49,13 +49,12 @@ class ConfigPagesController extends ControllerBase {
       $entity_type_manager->getStorage('config_pages'),
       $entity_type_manager->getStorage('config_pages_type'),
       $container->get('theme_handler'),
-      $container->get('entity.query'),
       $entity_type_manager
     );
   }
 
   /**
-   * Constructs a ConfigPages object.
+   * ConfigPagesController constructor.
    *
    * @param \Drupal\Core\Entity\EntityStorageInterface $config_pages_storage
    *   The config page storage.
@@ -63,16 +62,16 @@ class ConfigPagesController extends ControllerBase {
    *   The config page type storage.
    * @param \Drupal\Core\Extension\ThemeHandlerInterface $theme_handler
    *   The theme handler.
+   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
+   *   The entity type manager
    */
   public function __construct(EntityStorageInterface $config_pages_storage,
                               EntityStorageInterface $config_pages_type_storage,
                               ThemeHandlerInterface $theme_handler,
-                              QueryFactory $entity_query,
                               EntityTypeManagerInterface $entity_type_manager) {
     $this->ConfigPagesStorage = $config_pages_storage;
     $this->ConfigPagesTypeStorage = $config_pages_type_storage;
     $this->themeHandler = $theme_handler;
-    $this->entityQuery = $entity_query;
     $this->entityTypeManager = $entity_type_manager;
   }
 
@@ -129,8 +128,8 @@ class ConfigPagesController extends ControllerBase {
 
     $contextData = $typeEntity->getContextData();
 
-    $config_page_ids = $this->entityQuery
-      ->get('config_pages')
+    $config_page_ids = $this->ConfigPagesStorage
+      ->getQuery()
       ->condition('type', $cp_type)
       ->condition('context', $contextData)
       ->execute();