diff --git a/src/ArchitectureBundle/Bridge/Symfony/Messenger/Bus/QueryBus.php b/src/ArchitectureBundle/Bridge/Symfony/Messenger/Bus/QueryBus.php
index 8bde5fa..cd05b49 100644
--- a/src/ArchitectureBundle/Bridge/Symfony/Messenger/Bus/QueryBus.php
+++ b/src/ArchitectureBundle/Bridge/Symfony/Messenger/Bus/QueryBus.php
@@ -6,6 +6,7 @@
 
 use SixtyEightPublishers\ArchitectureBundle\Bus\QueryBusInterface;
 use SixtyEightPublishers\ArchitectureBundle\ReadModel\Query\QueryInterface;
+use Symfony\Component\Messenger\Envelope;
 use Symfony\Component\Messenger\HandleTrait;
 use Symfony\Component\Messenger\MessageBusInterface;
 
@@ -18,8 +19,13 @@ public function __construct(MessageBusInterface $messageBus)
         $this->messageBus = $messageBus;
     }
 
-    public function dispatch(QueryInterface $message): mixed
+    public function dispatch(QueryInterface $message, array $stamps = []): mixed
     {
-        return $this->handle($message);
+        $envelope = new Envelope(
+            message: $message,
+            stamps: $stamps,
+        );
+
+        return $this->handle($envelope);
     }
 }
diff --git a/src/ArchitectureBundle/Bus/CommandBusInterface.php b/src/ArchitectureBundle/Bus/CommandBusInterface.php
index 87bd8dd..7f7a5cf 100644
--- a/src/ArchitectureBundle/Bus/CommandBusInterface.php
+++ b/src/ArchitectureBundle/Bus/CommandBusInterface.php
@@ -10,7 +10,7 @@
 interface CommandBusInterface
 {
     /**
-     * @param StampInterface[] $stamps
+     * @param array<int, StampInterface> $stamps
      */
     public function dispatch(CommandInterface $message, array $stamps = []): void;
 }
diff --git a/src/ArchitectureBundle/Bus/QueryBusInterface.php b/src/ArchitectureBundle/Bus/QueryBusInterface.php
index db203df..77e9963 100644
--- a/src/ArchitectureBundle/Bus/QueryBusInterface.php
+++ b/src/ArchitectureBundle/Bus/QueryBusInterface.php
@@ -5,8 +5,12 @@
 namespace SixtyEightPublishers\ArchitectureBundle\Bus;
 
 use SixtyEightPublishers\ArchitectureBundle\ReadModel\Query\QueryInterface;
+use Symfony\Component\Messenger\Stamp\StampInterface;
 
 interface QueryBusInterface
 {
-    public function dispatch(QueryInterface $message): mixed;
+    /**
+     * @param array<int, StampInterface> $stamps
+     */
+    public function dispatch(QueryInterface $message, array $stamps = []): mixed;
 }