diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLProcessor.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLProcessor.java
index 08e199f930..a6b01c916d 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLProcessor.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLProcessor.java
@@ -364,9 +364,16 @@ public WebSQLExecuteInfo updateResultsDataBatch(
                     isAutoCommitEnabled = txnManager.isAutoCommit();
                     if (txnManager.isSupportsTransactions() && isAutoCommitEnabled) {
                         txnManager.setAutoCommit(monitor, false);
-                        savepoint = txnManager.setSavepoint(monitor, null);
                         revertToAutoCommit = true;
                     }
+                    if (!txnManager.isAutoCommit() && txnManager.supportsSavepoints()) {
+                        try {
+                            savepoint = txnManager.setSavepoint(monitor, null);
+                        } catch (Throwable e) {
+                            // May be savepoints not supported
+                            log.debug("Can't set savepoint", e);
+                        }
+                    }
                 }
                 try {
                     Map<String, Object> options = Collections.emptyMap();