diff --git a/src/Message/EnvelopeInterface.php b/src/Message/EnvelopeInterface.php
index e1873bcb..5c8266c3 100644
--- a/src/Message/EnvelopeInterface.php
+++ b/src/Message/EnvelopeInterface.php
@@ -21,9 +21,9 @@ public function withMessage(MessageInterface $message): self;
     /**
      * Finds an envelope in the current envelope stack or creates a new one from the message.
      *
-     * @template T
+     * @template T of EnvelopeInterface
      *
-     * @psalm-param T<class-string<EnvelopeInterface>> $className
+     * @psalm-param class-string<T> $className
      * @throws NotEnvelopInterfaceException Implementation MUST throw this exception if the given class does not
      *         implement {@see EnvelopeInterface}.
      *
diff --git a/src/Message/EnvelopeTrait.php b/src/Message/EnvelopeTrait.php
index 1dab866d..51f4440f 100644
--- a/src/Message/EnvelopeTrait.php
+++ b/src/Message/EnvelopeTrait.php
@@ -48,9 +48,9 @@ public function getMetadata(): array
     /**
      * Finds an envelope in the current envelope stack or creates a new one from the message.
      *
-     * @template T
+     * @template T of EnvelopeInterface
      *
-     * @psalm-param T<class-string<EnvelopeInterface>> $className
+     * @psalm-param class-string<T> $className
      * @throws NotEnvelopInterfaceException is thrown if the given class does not implement {@see EnvelopeInterface}.
      *
      * @psalm-return T