diff --git a/src/Controller/HandlePdfController.php b/src/Controller/HandlePdfController.php
index 96a535fe0ca2759810d55b8c14aa35e7f6ec8b9c..7a04d7231d015d79a1d43ea84cfb60f0700f30e0 100644
--- a/src/Controller/HandlePdfController.php
+++ b/src/Controller/HandlePdfController.php
@@ -4,7 +4,6 @@ namespace Drupal\fillpdf\Controller;
 
 use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\Controller\ControllerBase;
-use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\Link;
 use Drupal\Core\StreamWrapper\StreamWrapperInterface;
 use Drupal\Core\StreamWrapper\StreamWrapperManagerInterface;
@@ -89,13 +88,6 @@ class HandlePdfController extends ControllerBase {
    */
   protected $configFactory;
 
-  /**
-   * The module handler service.
-   *
-   * @var \Drupal\Core\Extension\ModuleHandlerInterface
-   */
-  protected $moduleHandler;
-
   /**
    * Constructs a FillPdfBackendManager object.
    *
@@ -117,8 +109,6 @@ class HandlePdfController extends ControllerBase {
    *   Provides a StreamWrapper manager.
    * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
    *   The configuration factory.
-   * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
-   *   The module handler service.
    */
   public function __construct(
     FillPdfLinkManipulatorInterface $link_manipulator,
@@ -130,7 +120,6 @@ class HandlePdfController extends ControllerBase {
     BackendProxyInterface $backend_proxy,
     StreamWrapperManagerInterface $stream_wrapper_manager,
     ConfigFactoryInterface $config_factory,
-    ModuleHandlerInterface $module_handler,
   ) {
     $this->linkManipulator = $link_manipulator;
     $this->contextManager = $context_manager;
@@ -141,7 +130,6 @@ class HandlePdfController extends ControllerBase {
     $this->backendProxy = $backend_proxy;
     $this->streamWrapperManager = $stream_wrapper_manager;
     $this->configFactory = $config_factory;
-    $this->moduleHandler = $module_handler;
   }
 
   /**
@@ -158,7 +146,6 @@ class HandlePdfController extends ControllerBase {
       $container->get('fillpdf.backend_proxy'),
       $container->get('stream_wrapper_manager'),
       $container->get('config.factory'),
-      $container->get('module_handler')
     );
   }
 
@@ -171,7 +158,7 @@ class HandlePdfController extends ControllerBase {
    *   The FillPDF context to alter.
    */
   public function alterContext(array &$context): void {
-    $this->moduleHandler->alter('fillpdf_populate_pdf_context', $context);
+    $this->moduleHandler()->alter('fillpdf_populate_pdf_context', $context);
   }
 
   /**