diff --git a/fluent-jdbc/src/main/java/org/codejargon/fluentjdbc/internal/query/TransactionInternal.java b/fluent-jdbc/src/main/java/org/codejargon/fluentjdbc/internal/query/TransactionInternal.java
index 3d12cfc..1377598 100644
--- a/fluent-jdbc/src/main/java/org/codejargon/fluentjdbc/internal/query/TransactionInternal.java
+++ b/fluent-jdbc/src/main/java/org/codejargon/fluentjdbc/internal/query/TransactionInternal.java
@@ -1,6 +1,5 @@
 package org.codejargon.fluentjdbc.internal.query;
 
-import org.codejargon.fluentjdbc.api.FluentJdbcException;
 import org.codejargon.fluentjdbc.api.FluentJdbcSqlException;
 import org.codejargon.fluentjdbc.api.integration.ConnectionProvider;
 import org.codejargon.fluentjdbc.api.query.Transaction;
@@ -63,7 +62,9 @@ private <T> T inNewTransaction(Supplier<T> operation, Map<ConnectionProvider, Co
                                 }
                                 throw e;
                             }
-                            con.commit();
+                            if (!con.getAutoCommit()) {
+                                con.commit();
+                            }
                         } catch(SQLException e) {
                             throw new FluentJdbcSqlException("Error executing transaction", e);
                         } finally {
diff --git a/fluent-jdbc/src/test/groovy/org/codejargon/fluentjdbc/internal/query/FluentJdbcTransactionTest.groovy b/fluent-jdbc/src/test/groovy/org/codejargon/fluentjdbc/internal/query/FluentJdbcTransactionTest.groovy
index 8bcf131..850219a 100644
--- a/fluent-jdbc/src/test/groovy/org/codejargon/fluentjdbc/internal/query/FluentJdbcTransactionTest.groovy
+++ b/fluent-jdbc/src/test/groovy/org/codejargon/fluentjdbc/internal/query/FluentJdbcTransactionTest.groovy
@@ -124,6 +124,27 @@ class FluentJdbcTransactionTest extends UpdateTestBase {
         1 * connection.setTransactionIsolation(Connection.TRANSACTION_SERIALIZABLE)
     }
 
+    def "Empty transaction doesn't throw exception"() {
+        given:
+        preparedStatement.executeUpdate() >> expectedUpdatedRows.intValue()
+        when:
+        query.transaction().in(
+                { ->
+                    // no queries
+                }
+        )
+        then:
+        // checking original state, then check before commit
+        connection.getAutoCommit() >> true >> true
+
+        _ * connection.getAutoCommit()
+        0 * connection.setAutoCommit(false)
+        0 * preparedStatement.close()
+        0 * connection.rollback()
+        0 * connection.commit()
+        1 * connection.setAutoCommit(true)
+    }
+
     def throwException() {
         throw new MyRuntimeException()
     }