diff --git a/Event/ControllerArgumentsEvent.php b/Event/ControllerArgumentsEvent.php
index 4c804ccf19..49ce0f11e4 100644
--- a/Event/ControllerArgumentsEvent.php
+++ b/Event/ControllerArgumentsEvent.php
@@ -94,13 +94,13 @@ public function getNamedArguments(): array
     }
 
     /**
-     * @template T of class-string|null
+     * @template T of object
      *
-     * @param T $className
+     * @param class-string<T>|null $className
      *
-     * @return array<class-string, list<object>>|list<object>
+     * @return array<class-string, list<object>>|list<T>
      *
-     * @psalm-return (T is null ? array<class-string, list<object>> : list<object>)
+     * @psalm-return (T is null ? array<class-string, list<object>> : list<T>)
      */
     public function getAttributes(?string $className = null): array
     {
diff --git a/Event/ControllerEvent.php b/Event/ControllerEvent.php
index aa0999d9e9..3dade73548 100644
--- a/Event/ControllerEvent.php
+++ b/Event/ControllerEvent.php
@@ -79,13 +79,13 @@ public function setController(callable $controller, ?array $attributes = null):
     }
 
     /**
-     * @template T of class-string|null
+     * @template T of object
      *
-     * @param T $className
+     * @param class-string<T>|null $className
      *
-     * @return array<class-string, list<object>>|list<object>
+     * @return array<class-string, list<object>>|list<T>
      *
-     * @psalm-return (T is null ? array<class-string, list<object>> : list<object>)
+     * @psalm-return (T is null ? array<class-string, list<object>> : list<T>)
      */
     public function getAttributes(?string $className = null): array
     {