diff --git a/application/src/main/java/org/thingsboard/server/service/sync/DefaultEntitiesExportImportService.java b/application/src/main/java/org/thingsboard/server/service/sync/DefaultEntitiesExportImportService.java
index 75c4ff9e12..55384b21db 100644
--- a/application/src/main/java/org/thingsboard/server/service/sync/DefaultEntitiesExportImportService.java
+++ b/application/src/main/java/org/thingsboard/server/service/sync/DefaultEntitiesExportImportService.java
@@ -70,7 +70,7 @@ public class DefaultEntitiesExportImportService implements EntitiesExportImportS
     }
 
 
-    @Transactional(rollbackFor = Exception.class)
+    @Transactional(rollbackFor = Exception.class, timeout = 120)
     @Override
     public List<EntityImportResult<?>> importEntities(SecurityUser user, List<EntityExportData<?>> exportDataList, EntityImportSettings importSettings) throws ThingsboardException {
         fixOrder(exportDataList);
diff --git a/application/src/main/java/org/thingsboard/server/service/sync/exporting/DefaultExportableEntitiesService.java b/application/src/main/java/org/thingsboard/server/service/sync/exporting/DefaultExportableEntitiesService.java
index a616dec6c4..bc8f406c54 100644
--- a/application/src/main/java/org/thingsboard/server/service/sync/exporting/DefaultExportableEntitiesService.java
+++ b/application/src/main/java/org/thingsboard/server/service/sync/exporting/DefaultExportableEntitiesService.java
@@ -21,6 +21,7 @@ import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.ExportableEntity;
 import org.thingsboard.server.common.data.HasTenantId;
@@ -130,6 +131,7 @@ public class DefaultExportableEntitiesService implements ExportableEntitiesServi
     }
 
 
+    @Transactional(readOnly = true, timeout = 40)
     @Override
     public List<EntityId> findEntitiesForRequest(TenantId tenantId, ExportRequest request) {
         switch (request.getType()) {