diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/license/LicenseReportRequest.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/license/LicenseReportRequest.java
index 311ae964b..f97415f25 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/license/LicenseReportRequest.java
+++ b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/license/LicenseReportRequest.java
@@ -36,10 +36,15 @@ public class LicenseReportRequest {
         return startDate;
     }
 
+    public boolean isStartDateBeforeEndDate() {
+
+        var endDate = this.endDate == null ? Instant.now() : this.endDate;
+        return getStartDate().isBefore(endDate);
+    }
 
     public Instant getEndDate() {
 
-        if (endDate == null) {
+        if (endDate == null || endDate.isAfter(Instant.now())) {
             endDate = Instant.now();
         }
         return endDate;
diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/LicenseReportService.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/LicenseReportService.java
index 8a09b5c33..f695736e4 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/LicenseReportService.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/LicenseReportService.java
@@ -36,7 +36,7 @@ public class LicenseReportService {
 
     public LicenseReport getLicenseReport(LicenseReportRequest licenseReportRequest) {
 
-        if (licenseReportRequest.getEndDate().isBefore(licenseReportRequest.getStartDate())) {
+        if (!licenseReportRequest.isStartDateBeforeEndDate()) {
             throw new BadRequestException("Invalid date period: End date is before start date.");
         }