diff --git a/src/Symfony/Component/Messenger/Tests/Transport/Doctrine/ConnectionTest.php b/src/Symfony/Component/Messenger/Tests/Transport/Doctrine/ConnectionTest.php
index 9ad8399426483..c7575e9b8746a 100644
--- a/src/Symfony/Component/Messenger/Tests/Transport/Doctrine/ConnectionTest.php
+++ b/src/Symfony/Component/Messenger/Tests/Transport/Doctrine/ConnectionTest.php
@@ -284,6 +284,7 @@ public function testFind()
             ->willReturn($queryBuilder);
         $queryBuilder
             ->method('where')
+            ->with('m.id = ? and m.queue_name = ?')
             ->willReturn($queryBuilder);
         $queryBuilder
             ->method('getSQL')
diff --git a/src/Symfony/Component/Messenger/Transport/Doctrine/Connection.php b/src/Symfony/Component/Messenger/Transport/Doctrine/Connection.php
index ef41dc5f02fe5..20098e2283669 100644
--- a/src/Symfony/Component/Messenger/Transport/Doctrine/Connection.php
+++ b/src/Symfony/Component/Messenger/Transport/Doctrine/Connection.php
@@ -291,9 +291,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]);
+        $stmt = $this->executeQuery($queryBuilder->getSQL(), [$id, $this->configuration['queue_name']]);
         $data = $stmt instanceof Result || $stmt instanceof DriverResult ? $stmt->fetchAssociative() : $stmt->fetch();
 
         return false === $data ? null : $this->decodeEnvelopeHeaders($data);