diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/DataSourcePropertyTester.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/DataSourcePropertyTester.java
index c222d84ef6386f95d14964057620df95db663dd5..756e305689649085d71ddbb80944a8c3a9e37dd6 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/DataSourcePropertyTester.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/DataSourcePropertyTester.java
@@ -94,8 +94,10 @@ public class DataSourcePropertyTester extends PropertyTester
                 }
                 case PROP_TRANSACTION_ACTIVE:
                     if (context != null && context.isConnected()) {
-                        boolean active = QMUtils.isTransactionActive(context);
-                        return Boolean.valueOf(active).equals(expectedValue);
+                        DBCTransactionManager txnManager = DBUtils.getTransactionManager(context);
+                        return txnManager != null && !txnManager.isAutoCommit();
+//                        boolean active = QMUtils.isTransactionActive(context);
+//                        return Boolean.valueOf(active).equals(expectedValue);
                     }
                     return Boolean.FALSE.equals(expectedValue);
             }