diff --git a/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/PreparedStatementTestBase.java b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/PreparedStatementTestBase.java
index a7291df1f..232b15f07 100644
--- a/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/PreparedStatementTestBase.java
+++ b/vertx-pg-client/src/test/java/io/vertx/tests/pgclient/PreparedStatementTestBase.java
@@ -547,6 +547,14 @@ private <T> void testInferDataType42P18(TestContext ctx, Class<T> type, T value,
           ctx.assertEquals("HELLO " + suffix2, str);
         }));
     }));
+    PgConnection.connect(vertx, options()).onComplete(ctx.asyncAssertSuccess(conn -> {
+      conn.begin()
+        .flatMap(tx -> conn.preparedQuery("SELECT CONCAT('HELLO ', $1)").execute(Tuple.of(value))
+          .eventually(() -> conn.close())
+          .onComplete(ctx.asyncAssertFailure(failure -> {
+            ctx.assertTrue(hasSqlstateCode(failure, "42P18"));
+          })));
+    }));
   }
 
   @Test
diff --git a/vertx-sql-client-codec/src/main/java/io/vertx/sqlclient/codec/SocketConnectionBase.java b/vertx-sql-client-codec/src/main/java/io/vertx/sqlclient/codec/SocketConnectionBase.java
index a0979c79e..8b1b9a973 100644
--- a/vertx-sql-client-codec/src/main/java/io/vertx/sqlclient/codec/SocketConnectionBase.java
+++ b/vertx-sql-client-codec/src/main/java/io/vertx/sqlclient/codec/SocketConnectionBase.java
@@ -334,7 +334,7 @@ private void fireCommandMessage(ChannelHandlerContext chctx, CommandMessage<?, ?
           ctx.flush();
         }
       } else {
-        if (isIndeterminatePreparedStatementError(cause) && !sendParameterTypes) {
+        if (queryCmd.autoCommit() && isIndeterminatePreparedStatementError(cause) && !sendParameterTypes) {
           ChannelHandlerContext ctx = socket.channelHandlerContext();
           // We cannot cache this prepared statement because it might be executed with another type
           fireCommandMessage(ctx, prepareCommand(queryCmd, handler, false, true));
diff --git a/vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/SqlConnectionBase.java b/vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/SqlConnectionBase.java
index 6a35f5269..88bdf0890 100644
--- a/vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/SqlConnectionBase.java
+++ b/vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/SqlConnectionBase.java
@@ -82,7 +82,7 @@ public Future<PreparedStatement> prepare(String sql, PrepareOptions options) {
       .compose(
       cr -> Future.succeededFuture(PreparedStatementBase.create(conn, context, cr, autoCommit())),
       err -> {
-        if (conn.isIndeterminatePreparedStatementError(err)) {
+        if (autoCommit() && conn.isIndeterminatePreparedStatementError(err)) {
           return Future.succeededFuture(PreparedStatementBase.create(conn, context, options, sql, autoCommit()));
         } else {
           return Future.failedFuture(err);