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 f97415f25..3fd1b7c8b 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
@@ -27,21 +27,6 @@ public class LicenseReportRequest {
 
     private List<String> dossierIds = new ArrayList<>();
 
-
-    public Instant getStartDate() {
-
-        if (startDate == null) {
-            startDate = Year.of(getEndDate().atOffset(ZoneOffset.UTC).getYear()).atMonth(1).atDay(1).atStartOfDay().toInstant(ZoneOffset.UTC);
-        }
-        return startDate;
-    }
-
-    public boolean isStartDateBeforeEndDate() {
-
-        var endDate = this.endDate == null ? Instant.now() : this.endDate;
-        return getStartDate().isBefore(endDate);
-    }
-
     public Instant getEndDate() {
 
         if (endDate == null || endDate.isAfter(Instant.now())) {
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 f695736e4..d994cd480 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
@@ -1,5 +1,6 @@
 package com.iqser.red.service.peristence.v1.server.service;
 
+import java.time.Instant;
 import java.time.OffsetDateTime;
 import java.time.YearMonth;
 import java.time.ZoneId;
@@ -36,7 +37,11 @@ public class LicenseReportService {
 
     public LicenseReport getLicenseReport(LicenseReportRequest licenseReportRequest) {
 
-        if (!licenseReportRequest.isStartDateBeforeEndDate()) {
+        if (licenseReportRequest.getStartDate() == null || licenseReportRequest.getStartDate().isAfter(Instant.now())) {
+            throw new BadRequestException("Invalid start date.");
+        }
+
+        if (licenseReportRequest.getStartDate().isAfter(licenseReportRequest.getEndDate())) {
             throw new BadRequestException("Invalid date period: End date is before start date.");
         }