diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java
index 988a79bb85..8002730686 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java
@@ -81,6 +81,7 @@ public abstract class JpaAbstractDao<E extends BaseEntity<D>, D>
     }
 
     protected E doSave(E entity, boolean isNew) {
+        EntityManager entityManager = getEntityManager();
         if (isNew) {
             if (entity instanceof HasVersion versionedEntity) {
                 versionedEntity.setVersion(1L);
@@ -179,6 +180,10 @@ public abstract class JpaAbstractDao<E extends BaseEntity<D>, D>
         return ModelConstants.TENANT_ID_COLUMN;
     }
 
+    protected EntityManager getEntityManager() {
+        return entityManager;
+    }
+
     protected JdbcTemplate getJdbcTemplate() {
         return jdbcTemplate;
     }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/JpaPartitionedAbstractDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/JpaPartitionedAbstractDao.java
index dad6fbf4f7..6afb8b4ede 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/JpaPartitionedAbstractDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/JpaPartitionedAbstractDao.java
@@ -29,8 +29,4 @@ public abstract class JpaPartitionedAbstractDao<E extends BaseEntity<D>, D> exte
 
     public abstract void createPartition(E entity);
 
-    protected EntityManager getEntityManager() {
-        return entityManager;
-    }
-
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/audit/DedicatedJpaAuditLogDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/audit/DedicatedJpaAuditLogDao.java
index 12069f87be..d40e1e5474 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/audit/DedicatedJpaAuditLogDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/audit/DedicatedJpaAuditLogDao.java
@@ -64,8 +64,8 @@ public class DedicatedJpaAuditLogDao extends JpaAuditLogDao {
 
     @Transactional(transactionManager = EVENTS_TRANSACTION_MANAGER)
     @Override
-    public boolean removeById(TenantId tenantId, UUID id) {
-        return super.removeById(tenantId, id);
+    public void removeById(TenantId tenantId, UUID id) {
+        super.removeById(tenantId, id);
     }
 
     @Transactional(transactionManager = EVENTS_TRANSACTION_MANAGER)