diff --git a/phpBB/config/default/container/services_twig.yml b/phpBB/config/default/container/services_twig.yml
index c10dfc577c..e7a7155deb 100644
--- a/phpBB/config/default/container/services_twig.yml
+++ b/phpBB/config/default/container/services_twig.yml
@@ -40,7 +40,6 @@ services:
             - '@template_context'
             - '@template.twig.environment'
             - '@language'
-            - '@dispatcher'
         tags:
             - { name: twig.extension }
 
diff --git a/phpBB/phpbb/template/twig/environment.php b/phpBB/phpbb/template/twig/environment.php
index a5af650c66..68351076fd 100644
--- a/phpBB/phpbb/template/twig/environment.php
+++ b/phpBB/phpbb/template/twig/environment.php
@@ -161,6 +161,16 @@ class environment extends \Twig\Environment
 		return $this->assets_bag;
 	}
 
+	/**
+	 * Gets the event dispatcher instance
+	 *
+	 * @return dispatcher_interface
+	 */
+	public function get_phpbb_dispatcher()
+	{
+		return $this->phpbb_dispatcher;
+	}
+
 	/**
 	* Get the namespace look up order
 	*
diff --git a/phpBB/phpbb/template/twig/extension.php b/phpBB/phpbb/template/twig/extension.php
index 9f2bfebb9f..982601e41b 100644
--- a/phpBB/phpbb/template/twig/extension.php
+++ b/phpBB/phpbb/template/twig/extension.php
@@ -28,23 +28,18 @@ class extension extends \Twig\Extension\AbstractExtension
 	/** @var \phpbb\language\language */
 	protected $language;
 
-	/** @var \phpbb\event\dispatcher_interface */
-	protected $phpbb_dispatcher;
-
 	/**
 	* Constructor
 	*
 	* @param \phpbb\template\context $context
 	* @param \phpbb\template\twig\environment $environment
 	* @param \phpbb\language\language $language
-	* @param \phpbb\event\dispatcher_interface $phpbb_dispatcher
 	*/
-	public function __construct(\phpbb\template\context $context, \phpbb\template\twig\environment $environment, $language, \phpbb\event\dispatcher_interface $phpbb_dispatcher)
+	public function __construct(\phpbb\template\context $context, \phpbb\template\twig\environment $environment, $language)
 	{
 		$this->context = $context;
 		$this->environment = $environment;
 		$this->language = $language;
-		$this->phpbb_dispatcher = $phpbb_dispatcher;
 	}
 
 	/**
@@ -69,7 +64,7 @@ class extension extends \Twig\Extension\AbstractExtension
 			new \phpbb\template\twig\tokenparser\includeparser,
 			new \phpbb\template\twig\tokenparser\includejs,
 			new \phpbb\template\twig\tokenparser\includecss,
-			new \phpbb\template\twig\tokenparser\event($this->environment, $this->phpbb_dispatcher),
+			new \phpbb\template\twig\tokenparser\event($this->environment),
 		);
 	}
 
diff --git a/phpBB/phpbb/template/twig/tokenparser/event.php b/phpBB/phpbb/template/twig/tokenparser/event.php
index 19a876ec3f..2fb096d454 100644
--- a/phpBB/phpbb/template/twig/tokenparser/event.php
+++ b/phpBB/phpbb/template/twig/tokenparser/event.php
@@ -29,10 +29,10 @@ class event extends \Twig\TokenParser\AbstractTokenParser
 	*
 	* @param \phpbb\template\twig\environment $environment
 	*/
-	public function __construct(\phpbb\template\twig\environment $environment, \phpbb\event\dispatcher_interface $phpbb_dispatcher = null)
+	public function __construct(\phpbb\template\twig\environment $environment)
 	{
 		$this->environment = $environment;
-		$this->phpbb_dispatcher = $phpbb_dispatcher;
+		$this->phpbb_dispatcher = $this->environment->get_phpbb_dispatcher();
 
 		$template_event_priority_array = [];
 		/**
diff --git a/tests/console/user/base.php b/tests/console/user/base.php
index 605493bd80..511cfff9a3 100644
--- a/tests/console/user/base.php
+++ b/tests/console/user/base.php
@@ -190,7 +190,7 @@ abstract class phpbb_console_user_base extends phpbb_database_test_case
 				'autoescape'	=> false,
 			]
 		);
-		$twig_extension = new \phpbb\template\twig\extension($context, $twig, $this->language, $phpbb_dispatcher);
+		$twig_extension = new \phpbb\template\twig\extension($context, $twig, $this->language);
 		$phpbb_container->set('template.twig.extensions.phpbb', $twig_extension);
 
 		$twig_extensions_collection = new \phpbb\di\service_collection($phpbb_container);
diff --git a/tests/controller/common_helper_route.php b/tests/controller/common_helper_route.php
index 19e4bad2f1..0cd52b7d8b 100644
--- a/tests/controller/common_helper_route.php
+++ b/tests/controller/common_helper_route.php
@@ -119,7 +119,6 @@ abstract class phpbb_controller_common_helper_route extends phpbb_database_test_
 		$assets_bag = new \phpbb\template\assets_bag();
 		$context = new \phpbb\template\context();
 		$loader = new \phpbb\template\twig\loader('');
-		$this->dispatcher = new \phpbb\event\dispatcher();
 		$twig = new \phpbb\template\twig\environment(
 			$assets_bag,
 			$this->config,
@@ -128,7 +127,7 @@ abstract class phpbb_controller_common_helper_route extends phpbb_database_test_
 			$cache_path,
 			null,
 			$loader,
-			$this->dispatcher,
+			new \phpbb\event\dispatcher(),
 			array(
 				'cache'			=> false,
 				'debug'			=> false,
@@ -136,7 +135,7 @@ abstract class phpbb_controller_common_helper_route extends phpbb_database_test_
 				'autoescape'	=> false,
 			)
 		);
-		$this->template = new phpbb\template\twig\twig($this->phpbb_path_helper, $this->config, $context, $twig, $cache_path, $this->user, array(new \phpbb\template\twig\extension($context, $twig, $this->user, $this->dispatcher)));
+		$this->template = new phpbb\template\twig\twig($this->phpbb_path_helper, $this->config, $context, $twig, $cache_path, $this->user, array(new \phpbb\template\twig\extension($context, $twig, $this->user)));
 		$twig->setLexer(new \phpbb\template\twig\lexer($twig));
 
 		$this->extension_manager = new phpbb_mock_extension_manager(
diff --git a/tests/email/email_parsing_test.php b/tests/email/email_parsing_test.php
index 7dbf802ee5..fc1d1ef3be 100644
--- a/tests/email/email_parsing_test.php
+++ b/tests/email/email_parsing_test.php
@@ -87,7 +87,7 @@ class phpbb_email_parsing_test extends phpbb_test_case
 				'autoescape'	=> false,
 			)
 		);
-		$twig_extension = new \phpbb\template\twig\extension($context, $twig, $lang, $dispatcher);
+		$twig_extension = new \phpbb\template\twig\extension($context, $twig, $lang);
 		$phpbb_container->set('template.twig.extensions.phpbb', $twig_extension);
 
 		$twig_extensions_collection = new \phpbb\di\service_collection($phpbb_container);
diff --git a/tests/extension/metadata_manager_test.php b/tests/extension/metadata_manager_test.php
index 48566096c6..095efd3a69 100644
--- a/tests/extension/metadata_manager_test.php
+++ b/tests/extension/metadata_manager_test.php
@@ -117,7 +117,7 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case
 		$lang = new \phpbb\language\language($lang_loader);
 		$this->user = new \phpbb\user($lang, '\phpbb\datetime');
 
-		$this->template = new phpbb\template\twig\twig($phpbb_path_helper, $this->config, $context, $twig, $cache_path, $this->user, array(new \phpbb\template\twig\extension($context, $twig, $this->user, $phpbb_dispatcher)));
+		$this->template = new phpbb\template\twig\twig($phpbb_path_helper, $this->config, $context, $twig, $cache_path, $this->user, array(new \phpbb\template\twig\extension($context, $twig, $this->user)));
 		$twig->setLexer(new \phpbb\template\twig\lexer($twig));
 	}
 
diff --git a/tests/template/extension_test.php b/tests/template/extension_test.php
index a762c9e026..5caae111ca 100644
--- a/tests/template/extension_test.php
+++ b/tests/template/extension_test.php
@@ -102,7 +102,6 @@ class phpbb_template_extension_test extends phpbb_template_template_test_case
 		$loader = new \phpbb\template\twig\loader([]);
 		$log = new \phpbb\log\dummy();
 		$assets_bag = new \phpbb\template\assets_bag();
-		$dispatcher = new \phpbb\event\dispatcher();
 		$twig = new \phpbb\template\twig\environment(
 			$assets_bag,
 			$config,
@@ -111,7 +110,7 @@ class phpbb_template_extension_test extends phpbb_template_template_test_case
 			$cache_path,
 			null,
 			$loader,
-			$dispatcher,
+			new \phpbb\event\dispatcher(),
 			[
 				'cache'			=> false,
 				'debug'			=> false,
@@ -127,7 +126,7 @@ class phpbb_template_extension_test extends phpbb_template_template_test_case
 			$cache_path,
 			$this->user,
 			[
-				new \phpbb\template\twig\extension($context, $twig, $this->lang, $dispatcher),
+				new \phpbb\template\twig\extension($context, $twig, $this->lang),
 				new \phpbb\template\twig\extension\avatar($avatar_helper),
 				new \phpbb\template\twig\extension\config($config),
 				new \phpbb\template\twig\extension\icon($this->user),
diff --git a/tests/template/template_allfolder_test.php b/tests/template/template_allfolder_test.php
index 88f23d4570..a495f8aff8 100644
--- a/tests/template/template_allfolder_test.php
+++ b/tests/template/template_allfolder_test.php
@@ -60,7 +60,6 @@ class phpbb_template_allfolder_test extends phpbb_template_template_test_case
 		$loader = new \phpbb\template\twig\loader('');
 		$log = new \phpbb\log\dummy();
 		$assets_bag = new \phpbb\template\assets_bag();
-		$dispatcher = new \phpbb\event\dispatcher();
 		$twig = new \phpbb\template\twig\environment(
 			$assets_bag,
 			$config,
@@ -69,7 +68,7 @@ class phpbb_template_allfolder_test extends phpbb_template_template_test_case
 			$cache_path,
 			$this->extension_manager,
 			$loader,
-			$dispatcher,
+			new \phpbb\event\dispatcher(),
 			array(
 				'cache'			=> false,
 				'debug'			=> false,
@@ -77,7 +76,7 @@ class phpbb_template_allfolder_test extends phpbb_template_template_test_case
 				'autoescape'	=> false,
 			)
 		);
-		$this->template = new \phpbb\template\twig\twig($path_helper, $config, $context, $twig, $cache_path, $this->user, array(new \phpbb\template\twig\extension($context, $twig, $this->user, $dispatcher)), $this->extension_manager);
+		$this->template = new \phpbb\template\twig\twig($path_helper, $config, $context, $twig, $cache_path, $this->user, array(new \phpbb\template\twig\extension($context, $twig, $this->user)), $this->extension_manager);
 		$twig->setLexer(new \phpbb\template\twig\lexer($twig));
 
 		$this->template_path = $this->test_path . '/templates';
diff --git a/tests/template/template_events_test.php b/tests/template/template_events_test.php
index 3f005ae6ec..a9b1d39451 100644
--- a/tests/template/template_events_test.php
+++ b/tests/template/template_events_test.php
@@ -154,7 +154,6 @@ Zeta test event in all',
 		$loader = new \phpbb\template\twig\loader('');
 		$log = new \phpbb\log\dummy();
 		$assets_bag = new \phpbb\template\assets_bag();
-		$dispatcher = new \phpbb\event\dispatcher();
 		$twig = new \phpbb\template\twig\environment(
 			$assets_bag,
 			$config,
@@ -163,7 +162,7 @@ Zeta test event in all',
 			$cache_path,
 			$this->extension_manager,
 			$loader,
-			$dispatcher,
+			new \phpbb\event\dispatcher(),
 			array(
 				'cache'			=> false,
 				'debug'			=> false,
@@ -171,7 +170,7 @@ Zeta test event in all',
 				'autoescape'	=> false,
 			)
 		);
-		$this->template = new \phpbb\template\twig\twig($path_helper, $config, $context, $twig, $cache_path, $this->user, array(new \phpbb\template\twig\extension($context, $twig, $this->user, $dispatcher)), $this->extension_manager);
+		$this->template = new \phpbb\template\twig\twig($path_helper, $config, $context, $twig, $cache_path, $this->user, array(new \phpbb\template\twig\extension($context, $twig, $this->user)), $this->extension_manager);
 		$twig->setLexer(new \phpbb\template\twig\lexer($twig));
 
 		$this->template->set_custom_style(((!empty($style_names)) ? $style_names : 'silver'), array($this->template_path));
diff --git a/tests/template/template_includecss_test.php b/tests/template/template_includecss_test.php
index 603fa6c08c..a11f627c6f 100644
--- a/tests/template/template_includecss_test.php
+++ b/tests/template/template_includecss_test.php
@@ -46,7 +46,6 @@ class phpbb_template_template_includecss_test extends phpbb_template_template_te
 		$loader = new \phpbb\template\twig\loader('');
 		$log = new \phpbb\log\dummy();
 		$assets_bag = new \phpbb\template\assets_bag();
-		$dispatcher = new \phpbb\event\dispatcher();
 		$twig = new \phpbb\template\twig\environment(
 			$assets_bag,
 			$config,
@@ -55,7 +54,7 @@ class phpbb_template_template_includecss_test extends phpbb_template_template_te
 			$cache_path,
 			null,
 			$loader,
-			$dispatcher,
+			new \phpbb\event\dispatcher(),
 			array(
 				'cache'			=> false,
 				'debug'			=> false,
@@ -70,7 +69,7 @@ class phpbb_template_template_includecss_test extends phpbb_template_template_te
 			$twig,
 			$cache_path,
 			$this->user,
-			array(new \phpbb\template\twig\extension($context, $twig, $this->user, $dispatcher)),
+			array(new \phpbb\template\twig\extension($context, $twig, $this->user)),
 			new phpbb_mock_extension_manager(
 				__DIR__ . '/',
 				array(
diff --git a/tests/template/template_test_case.php b/tests/template/template_test_case.php
index da9280c6eb..5224e24b71 100644
--- a/tests/template/template_test_case.php
+++ b/tests/template/template_test_case.php
@@ -97,7 +97,6 @@ class phpbb_template_template_test_case extends phpbb_test_case
 		$loader = new \phpbb\template\twig\loader('');
 		$log = new \phpbb\log\dummy();
 		$assets_bag = new \phpbb\template\assets_bag();
-		$dispatcher = new \phpbb\event\dispatcher();
 		$twig = new \phpbb\template\twig\environment(
 			$assets_bag,
 			$config,
@@ -106,7 +105,7 @@ class phpbb_template_template_test_case extends phpbb_test_case
 			$cache_path,
 			null,
 			$loader,
-			$dispatcher,
+			new \phpbb\event\dispatcher(),
 			array(
 				'cache'			=> false,
 				'debug'			=> false,
@@ -114,8 +113,7 @@ class phpbb_template_template_test_case extends phpbb_test_case
 				'autoescape'	=> false,
 			)
 		);
-
-		$this->template = new phpbb\template\twig\twig($path_helper, $config, $context, $twig, $cache_path, $this->user, array(new \phpbb\template\twig\extension($context, $twig, $lang, $dispatcher)));
+		$this->template = new phpbb\template\twig\twig($path_helper, $config, $context, $twig, $cache_path, $this->user, array(new \phpbb\template\twig\extension($context, $twig, $lang)));
 		$twig->setLexer(new \phpbb\template\twig\lexer($twig));
 		$this->template->set_custom_style('tests', $this->template_path);
 	}
diff --git a/tests/template/template_test_case_with_tree.php b/tests/template/template_test_case_with_tree.php
index 637a1af04a..214d3503c8 100644
--- a/tests/template/template_test_case_with_tree.php
+++ b/tests/template/template_test_case_with_tree.php
@@ -47,7 +47,6 @@ class phpbb_template_template_test_case_with_tree extends phpbb_template_templat
 		$loader = new \phpbb\template\twig\loader('');
 		$log = new \phpbb\log\dummy();
 		$assets_bag = new \phpbb\template\assets_bag();
-		$dispatcher = new \phpbb\event\dispatcher();
 		$twig = new \phpbb\template\twig\environment(
 			$assets_bag,
 			$config,
@@ -56,7 +55,7 @@ class phpbb_template_template_test_case_with_tree extends phpbb_template_templat
 			$cache_path,
 			null,
 			$loader,
-			$dispatcher,
+			new \phpbb\event\dispatcher(),
 			array(
 				'cache'			=> false,
 				'debug'			=> false,
@@ -64,7 +63,7 @@ class phpbb_template_template_test_case_with_tree extends phpbb_template_templat
 				'autoescape'	=> false,
 			)
 		);
-		$this->template = new phpbb\template\twig\twig($this->phpbb_path_helper, $config, $context, $twig, $cache_path, $this->user, array(new \phpbb\template\twig\extension($context, $twig, $this->user, $dispatcher)));
+		$this->template = new phpbb\template\twig\twig($this->phpbb_path_helper, $config, $context, $twig, $cache_path, $this->user, array(new \phpbb\template\twig\extension($context, $twig, $this->user)));
 		$twig->setLexer(new \phpbb\template\twig\lexer($twig));
 		$this->template->set_custom_style('tests', array($this->template_path, $this->parent_template_path));
 	}
diff --git a/tests/template/twig_test.php b/tests/template/twig_test.php
index a3bb071b0f..69280caa15 100644
--- a/tests/template/twig_test.php
+++ b/tests/template/twig_test.php
@@ -65,7 +65,6 @@ class twig_test extends \phpbb_test_case
 		$loader = new \phpbb\template\twig\loader('');
 		$log = new \phpbb\log\dummy();
 		$assets_bag = new \phpbb\template\assets_bag();
-		$dispatcher = new \phpbb\event\dispatcher();
 		$twig = new \phpbb\template\twig\environment(
 			$assets_bag,
 			$config,
@@ -74,7 +73,7 @@ class twig_test extends \phpbb_test_case
 			$cache_path,
 			null,
 			$loader,
-			$dispatcher,
+			new \phpbb\event\dispatcher(),
 			[
 				'cache'			=> false,
 				'debug'			=> false,
@@ -82,7 +81,7 @@ class twig_test extends \phpbb_test_case
 				'autoescape'	=> false,
 			]
 		);
-		$this->template = new \phpbb\template\twig\twig($path_helper, $config, $context, $twig, $cache_path, $this->user, array(new \phpbb\template\twig\extension($context, $twig, $this->user, $dispatcher)));
+		$this->template = new \phpbb\template\twig\twig($path_helper, $config, $context, $twig, $cache_path, $this->user, array(new \phpbb\template\twig\extension($context, $twig, $this->user)));
 		$twig->setLexer(new \phpbb\template\twig\lexer($twig));
 	}
 
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index 7a1d7afa78..2ade7533cc 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -407,7 +407,7 @@ class phpbb_functional_test_case extends phpbb_test_case
 				'autoescape'	=> false,
 			]
 		);
-		$twig_extension = new \phpbb\template\twig\extension($context, $twig, $lang, $phpbb_dispatcher);
+		$twig_extension = new \phpbb\template\twig\extension($context, $twig, $lang);
 		$container->set('template.twig.extensions.phpbb', $twig_extension);
 
 		$twig_extensions_collection = new \phpbb\di\service_collection($container);