diff --git a/core/lib/Drupal/Core/Database/Driver/mysql/Connection.php b/core/lib/Drupal/Core/Database/Driver/mysql/Connection.php
index 99537dd356..f82cd0cab0 100644
--- a/core/lib/Drupal/Core/Database/Driver/mysql/Connection.php
+++ b/core/lib/Drupal/Core/Database/Driver/mysql/Connection.php
@@ -355,6 +355,8 @@ public function __construct(\PDO $connection, array $connection_options = []) {
    */
   public function query($query, array $args = [], $options = []) {
     try {
+      // @todo remove unsetting the 'target' options key in Drupal 9.0.0.
+      unset($options['target']);
       return parent::query($query, $args, $options);
     }
     catch (DatabaseException $e) {