diff --git a/dao/src/main/java/org/thingsboard/server/dao/Dao.java b/dao/src/main/java/org/thingsboard/server/dao/Dao.java
index e7290cdced..e912872496 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/Dao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/Dao.java
@@ -39,7 +39,7 @@ public interface Dao<T> {
 
     T saveAndFlush(TenantId tenantId, T t);
 
-    boolean removeById(TenantId tenantId, UUID id);
+    void removeById(TenantId tenantId, UUID id);
 
     void removeAllByIds(Collection<UUID> ids);
 
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 9a58e68895..423dc8a41a 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
@@ -144,12 +144,9 @@ public abstract class JpaAbstractDao<E extends BaseEntity<D>, D>
 
     @Override
     @Transactional
-    public boolean removeById(TenantId tenantId, UUID id) {
-//        jdbcTemplate.queryForObject("DELETE FROM " + getEntityType().getTableName() + " WHERE id = ? RETURNING version", Integer.class, id);
-        // TODO: increment version...
+    public void removeById(TenantId tenantId, UUID id) {
         getRepository().deleteById(id);
         log.debug("Remove request: {}", id);
-        return !getRepository().existsById(id);
     }
 
     @Transactional