diff --git a/application/src/main/java/org/thingsboard/server/controller/EntitiesExportImportController.java b/application/src/main/java/org/thingsboard/server/controller/EntitiesExportImportController.java
index afe2a4ac1f..a6ad9f1ca6 100644
--- a/application/src/main/java/org/thingsboard/server/controller/EntitiesExportImportController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/EntitiesExportImportController.java
@@ -81,6 +81,7 @@ public class EntitiesExportImportController extends BaseController {
 
     private List<EntityExportData<?>> exportEntitiesByRequest(SecurityUser user, ExportRequest exportRequest) throws ThingsboardException {
         List<EntityId> entities = exportableEntitiesService.findEntitiesForRequest(user.getTenantId(), exportRequest);
+
         EntityExportSettings exportSettings = exportRequest.getExportSettings();
         if (exportSettings == null) {
             exportSettings = EntityExportSettings.builder()
diff --git a/application/src/test/java/org/thingsboard/server/controller/sql/EntitiesExportImportControllerSqlTest.java b/application/src/test/java/org/thingsboard/server/controller/sql/EntitiesExportImportControllerSqlTest.java
index 44d8f5f461..bd237e39d0 100644
--- a/application/src/test/java/org/thingsboard/server/controller/sql/EntitiesExportImportControllerSqlTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/sql/EntitiesExportImportControllerSqlTest.java
@@ -659,7 +659,7 @@ public class EntitiesExportImportControllerSqlTest extends BaseEntitiesExportImp
             exportRequest.setExportSettings(new EntityExportSettings());
             exportRequest.setPageSize(10);
             exportRequest.setEntityType(entityType);
-            exportRequest.setCustomerId(customer.getId());
+            exportRequest.setCustomerId(customer.getUuidId());
             exportRequests.add(exportRequest);
         }