diff --git a/repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/JdbcSession.java b/repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/JdbcSession.java
index 1bcaa00641e..bb36ed542bd 100644
--- a/repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/JdbcSession.java
+++ b/repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/JdbcSession.java
@@ -240,7 +240,9 @@ public SupportedDatabase databaseType() {
     @Override
     public void close() {
         try {
-            commit();
+            if (!connection.getAutoCommit()) {
+                commit();
+            }
             connection.close();
         } catch (SQLException e) {
             throw new SystemException(e);