diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/EntityAlarmRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/EntityAlarmRepository.java
index f6250e98f0..2ed2364621 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/EntityAlarmRepository.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/EntityAlarmRepository.java
@@ -36,6 +36,8 @@ public interface EntityAlarmRepository extends JpaRepository<EntityAlarmEntity,
     void deleteByEntityId(@Param("entityId") UUID entityId);
 
     @Transactional
-    void deleteByTenantId(UUID tenantId);
+    @Modifying
+    @Query("DELETE FROM EntityAlarmEntity a WHERE a.tenantId = :tenantId")
+    void deleteByTenantId(@Param("tenantId") UUID tenantId);
 
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/notification/NotificationRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/notification/NotificationRepository.java
index 586af7d674..6d4516ee61 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/notification/NotificationRepository.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/notification/NotificationRepository.java
@@ -59,13 +59,19 @@ public interface NotificationRepository extends JpaRepository<NotificationEntity
     Page<NotificationEntity> findByRequestId(UUID requestId, Pageable pageable);
 
     @Transactional
-    int deleteByIdAndRecipientId(UUID id, UUID recipientId);
+    @Modifying
+    @Query("DELETE FROM NotificationEntity n WHERE n.id = :id AND n.recipientId = :recipientId")
+    int deleteByIdAndRecipientId(@Param("id") UUID id, @Param("recipientId") UUID recipientId);
 
     @Transactional
-    void deleteByRequestId(UUID requestId);
+    @Modifying
+    @Query("DELETE FROM NotificationEntity n WHERE n.requestId = :requestId")
+    void deleteByRequestId(@Param("requestId") UUID requestId);
 
     @Transactional
-    void deleteByRecipientId(UUID recipientId);
+    @Modifying
+    @Query("DELETE FROM NotificationEntity n WHERE n.recipientId = :recipientId")
+    void deleteByRecipientId(@Param("recipientId") UUID recipientId);
 
     @Modifying
     @Transactional
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/notification/NotificationRequestRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/notification/NotificationRequestRepository.java
index 126295616f..e7f3ac529b 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/notification/NotificationRequestRepository.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/notification/NotificationRequestRepository.java
@@ -70,9 +70,13 @@ public interface NotificationRequestRepository extends JpaRepository<Notificatio
     boolean existsByTenantIdAndStatusAndTemplateId(UUID tenantId, NotificationRequestStatus status, UUID templateId);
 
     @Transactional
-    int deleteAllByCreatedTimeBefore(long ts);
+    @Modifying
+    @Query("DELETE FROM NotificationRequestEntity r WHERE r.createdTime < :ts")
+    int deleteAllByCreatedTimeBefore(@Param("ts") long ts);
 
     @Transactional
-    void deleteByTenantId(UUID tenantId);
+    @Modifying
+    @Query("DELETE FROM NotificationRequestEntity r WHERE r.tenantId = :tenantId")
+    void deleteByTenantId(@Param("tenantId") UUID tenantId);
 
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/notification/NotificationRuleRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/notification/NotificationRuleRepository.java
index 9dfb34c18d..c661adca8f 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/notification/NotificationRuleRepository.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/notification/NotificationRuleRepository.java
@@ -18,6 +18,7 @@ package org.thingsboard.server.dao.sql.notification;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
@@ -58,7 +59,9 @@ public interface NotificationRuleRepository extends JpaRepository<NotificationRu
                                                                       Pageable pageable);
 
     @Transactional
-    void deleteByTenantId(UUID tenantId);
+    @Modifying
+    @Query("DELETE FROM NotificationRuleEntity r WHERE r.tenantId = :tenantId")
+    void deleteByTenantId(@Param("tenantId") UUID tenantId);
 
     NotificationRuleEntity findByTenantIdAndName(UUID tenantId, String name);
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/notification/NotificationTargetRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/notification/NotificationTargetRepository.java
index 278fea696e..3c451e4e4a 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/notification/NotificationTargetRepository.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/notification/NotificationTargetRepository.java
@@ -18,6 +18,7 @@ package org.thingsboard.server.dao.sql.notification;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
@@ -49,7 +50,9 @@ public interface NotificationTargetRepository extends JpaRepository<Notification
     List<NotificationTargetEntity> findByTenantIdAndIdIn(UUID tenantId, List<UUID> ids);
 
     @Transactional
-    void deleteByTenantId(UUID tenantId);
+    @Modifying
+    @Query("DELETE FROM NotificationTargetEntity t WHERE t.tenantId = :tenantId")
+    void deleteByTenantId(@Param("tenantId") UUID tenantId);
 
     long countByTenantId(UUID tenantId);
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/notification/NotificationTemplateRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/notification/NotificationTemplateRepository.java
index 73a25b98c3..3e68819b26 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/notification/NotificationTemplateRepository.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/notification/NotificationTemplateRepository.java
@@ -18,6 +18,7 @@ package org.thingsboard.server.dao.sql.notification;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
@@ -42,7 +43,9 @@ public interface NotificationTemplateRepository extends JpaRepository<Notificati
                                                                                      Pageable pageable);
 
     @Transactional
-    void deleteByTenantId(UUID tenantId);
+    @Modifying
+    @Query("DELETE FROM NotificationTemplateEntity t WHERE t.tenantId = :tenantId")
+    void deleteByTenantId(@Param("tenantId") UUID tenantId);
 
     NotificationTemplateEntity findByTenantIdAndName(UUID tenantId, String name);