diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/Connection.php b/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/Connection.php
index daf95b5fbbceb..ffc4f60b886c9 100644
--- a/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/Connection.php
+++ b/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/Connection.php
@@ -278,9 +278,9 @@ public function findAll(int $limit = null): array
     public function find($id): ?array
     {
         $queryBuilder = $this->createQueryBuilder()
-            ->where('m.id = ?');
+            ->where('m.id = ? and m.queue_name = ?');
+        $stmt = $this->executeQuery($queryBuilder->getSQL(), [$id, $this->configuration['queue_name']]);
 
-        $stmt = $this->executeQuery($queryBuilder->getSQL(), [$id]);
         $data = $stmt instanceof Result || $stmt instanceof DriverResult ? $stmt->fetchAssociative() : $stmt->fetch();
 
         return false === $data ? null : $this->decodeEnvelopeHeaders($data);