diff --git a/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java b/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java
index bebd2cc..4748c22 100644
--- a/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java
@@ -279,8 +279,14 @@ public class TelemetryController extends BaseController {
deleteFromTs = 0L;
deleteToTs = System.currentTimeMillis();
} else {
- deleteFromTs = startTs;
- deleteToTs = endTs;
+ if (startTs == null || endTs == null) {
+ deleteToTs = endTs;
+ return getImmediateDeferredResult("When deleteAllDataForKeys is false, start and end timestamp values shouldn't be empty", HttpStatus.BAD_REQUEST);
+ }
+ else{
+ deleteFromTs = startTs;
+ deleteToTs = endTs;
+ }
}
return accessValidator.validateEntityAndCallback(user, entityIdStr, (result, tenantId, entityId) -> {
