diff --git a/phpBB/includes/controller/resolver.php b/phpBB/includes/controller/resolver.php
index 901aa7eaa0..ee469aa9c8 100644
--- a/phpBB/includes/controller/resolver.php
+++ b/phpBB/includes/controller/resolver.php
@@ -109,6 +109,10 @@ class phpbb_controller_resolver implements ControllerResolverInterface
 			{
 				$arguments[] = $attributes[$param->name];
 			}
+			else if ($param->getClass() && $param->getClass()->isInstance($request))
+			{
+				$arguments[] = $request;
+			}
 			else if ($param->isDefaultValueAvailable())
 			{
 				$arguments[] = $param->getDefaultValue();