diff --git a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/MySQLConnectOptions.java b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/MySQLConnectOptions.java
index b06a5bba93..d0bef295c8 100644
--- a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/MySQLConnectOptions.java
+++ b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/MySQLConnectOptions.java
@@ -103,6 +103,7 @@ public MySQLConnectOptions(SqlConnectOptions other) {
       this.serverRsaPublicKeyPath = opts.serverRsaPublicKeyPath;
       this.serverRsaPublicKeyValue = opts.serverRsaPublicKeyValue != null ? opts.serverRsaPublicKeyValue.copy() : null;
       this.characterEncoding = opts.characterEncoding;
+      this.pipeliningLimit = opts.pipeliningLimit;
       this.authenticationPlugin = opts.authenticationPlugin;
     }
   }
@@ -116,6 +117,7 @@ public MySQLConnectOptions(MySQLConnectOptions other) {
     this.serverRsaPublicKeyPath = other.serverRsaPublicKeyPath;
     this.serverRsaPublicKeyValue = other.serverRsaPublicKeyValue != null ? other.serverRsaPublicKeyValue.copy() : null;
     this.characterEncoding = other.characterEncoding;
+    this.pipeliningLimit = other.pipeliningLimit;
     this.authenticationPlugin = other.authenticationPlugin;
   }
 
diff --git a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/ExtendedQueryCommandCodec.java b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/ExtendedQueryCommandCodec.java
index 4323fae3e2..f4c9d61006 100644
--- a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/ExtendedQueryCommandCodec.java
+++ b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/ExtendedQueryCommandCodec.java
@@ -59,12 +59,6 @@ void encode(MySQLEncoder encoder) {
       } else {
         // CURSOR_TYPE_NO_CURSOR
         sendStatementExecuteCommand(statement, statement.sendTypesToServer(), params, CURSOR_TYPE_NO_CURSOR);
-
-        // Close managed prepare statement
-        MySQLPreparedStatement ps = (MySQLPreparedStatement) this.cmd.ps;
-        if (ps.closeAfterUsage) {
-          sendCloseStatementCommand(ps);
-        }
       }
     }
   }