diff --git a/src/Symfony/Component/Messenger/Adapter/AmqpExt/Connection.php b/src/Symfony/Component/Messenger/Adapter/AmqpExt/Connection.php
index 58702eb737..1597c017ee 100644
--- a/src/Symfony/Component/Messenger/Adapter/AmqpExt/Connection.php
+++ b/src/Symfony/Component/Messenger/Adapter/AmqpExt/Connection.php
@@ -218,6 +218,6 @@ class Connection
 
     private function shouldSetup(): bool
     {
-        return !array_key_exists('auto-setup', $this->connectionCredentials) || 'false' !== $this->connectionCredentials['auto-setup'];
+        return !array_key_exists('auto-setup', $this->connectionCredentials) || !in_array($this->connectionCredentials['auto-setup'], array(false, 'false'), true);
     }
 }
diff --git a/src/Symfony/Component/Messenger/Tests/Adapter/AmqpExt/ConnectionTest.php b/src/Symfony/Component/Messenger/Tests/Adapter/AmqpExt/ConnectionTest.php
index 54ac465c33..62f6f94974 100644
--- a/src/Symfony/Component/Messenger/Tests/Adapter/AmqpExt/ConnectionTest.php
+++ b/src/Symfony/Component/Messenger/Tests/Adapter/AmqpExt/ConnectionTest.php
@@ -182,6 +182,12 @@ class ConnectionTest extends TestCase
 
         $connection = Connection::fromDsn('amqp://localhost/%2f/messages?queue[routing_key]=my_key', array('auto-setup' => 'false'), true, $factory);
         $connection->publish('body');
+
+        $connection = Connection::fromDsn('amqp://localhost/%2f/messages?queue[routing_key]=my_key', array('auto-setup' => false), true, $factory);
+        $connection->publish('body');
+
+        $connection = Connection::fromDsn('amqp://localhost/%2f/messages?queue[routing_key]=my_key&auto-setup=false', array(), true, $factory);
+        $connection->publish('body');
     }
 }