diff --git a/src/Symfony/Component/Messenger/Tests/Transport/RedisExt/ConnectionTest.php b/src/Symfony/Component/Messenger/Tests/Transport/RedisExt/ConnectionTest.php
index fae72fa781..c2654d326d 100644
--- a/src/Symfony/Component/Messenger/Tests/Transport/RedisExt/ConnectionTest.php
+++ b/src/Symfony/Component/Messenger/Tests/Transport/RedisExt/ConnectionTest.php
@@ -115,7 +115,8 @@ class ConnectionTest extends TestCase
 
     public function testGetAfterReject()
     {
-        $connection = Connection::fromDsn('redis://localhost/messenger-rejectthenget');
+        $redis = new \Redis();
+        $connection = Connection::fromDsn('redis://localhost/messenger-rejectthenget', [], $redis);
         try {
             $connection->setup();
         } catch (TransportException $e) {
@@ -129,5 +130,20 @@ class ConnectionTest extends TestCase
 
         $connection = Connection::fromDsn('redis://localhost/messenger-rejectthenget');
         $this->assertNotNull($connection->get());
+
+        $redis->del('messenger-rejectthenget');
+    }
+
+    public function testBlockingTimeout()
+    {
+        $redis = new \Redis();
+        $connection = Connection::fromDsn('redis://localhost/messenger-blockingtimeout', ['blocking_timeout' => 1], $redis);
+        try {
+            $connection->setup();
+        } catch (TransportException $e) {
+        }
+
+        $this->assertNull($connection->get());
+        $redis->del('messenger-blockingtimeout');
     }
 }
diff --git a/src/Symfony/Component/Messenger/Transport/RedisExt/Connection.php b/src/Symfony/Component/Messenger/Transport/RedisExt/Connection.php
index 66dc9fe9d6..566e3d6c62 100644
--- a/src/Symfony/Component/Messenger/Transport/RedisExt/Connection.php
+++ b/src/Symfony/Component/Messenger/Transport/RedisExt/Connection.php
@@ -102,7 +102,7 @@ class Connection
             return $this->get();
         }
 
-        foreach ($messages[$this->stream] as $key => $message) {
+        foreach ($messages[$this->stream] ?? [] as $key => $message) {
             $redisEnvelope = \json_decode($message['message'], true);
 
             return [