diff --git a/application/src/main/resources/thingsboard.yml b/application/src/main/resources/thingsboard.yml
index 5433aa2e0b..b9fd354760 100644
--- a/application/src/main/resources/thingsboard.yml
+++ b/application/src/main/resources/thingsboard.yml
@@ -473,7 +473,7 @@ spring:
         enabled: "true"
   jpa:
     properties:
-      javax.persistence.query.timeout: "${JAVAX_PERSISTENCE_QUERY_TIMEOUT:29000}"
+      javax.persistence.query.timeout: "${JAVAX_PERSISTENCE_QUERY_TIMEOUT:30000}"
     open-in-view: "false"
     hibernate:
       ddl-auto: "none"
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/event/EventRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/event/EventRepository.java
index 5f6cf91ab3..270ab26329 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/event/EventRepository.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/event/EventRepository.java
@@ -241,10 +241,4 @@ public interface EventRepository extends PagingAndSortingRepository<EventEntity,
                                            @Param("errorsOccurred") Integer errorsOccurred,
                                            Pageable pageable);
 
-    /**
-     *  Sleep 3 second on JPA connection
-     * */
-    @Query(value = "select count(*) from pg_sleep(3)", nativeQuery = true)
-    Long slowQuery();
-
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDao.java
index 383b4eac82..ee09bb7a90 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDao.java
@@ -144,14 +144,6 @@ public class JpaBaseEventDao extends JpaAbstractDao<EventEntity, Event> implemen
 
     @Override
     public PageData<Event> findEvents(UUID tenantId, EntityId entityId, String eventType, TimePageLink pageLink) {
-        log.warn("going to run slow query");
-        try {
-            eventRepository.slowQuery();
-        } catch (Exception e) {
-            log.error("slowQuery" , e);
-            throw e;
-        }
-        log.warn("finished slow query");
         return DaoUtil.toPageData(
                 eventRepository
                         .findEventsByTenantIdAndEntityIdAndEventType(