diff --git a/src/components/Export/exportLoadingModal.tsx b/src/components/Export/exportLoadingModal.tsx
index 5c0d71217cbb38bce97f9953bad5ed4688bf469b..79379ca7ad5ad5e79979d4bad48697719c4bfcf3 100644
--- a/src/components/Export/exportLoadingModal.tsx
+++ b/src/components/Export/exportLoadingModal.tsx
@@ -76,7 +76,8 @@ const ExportLoadingModal: React.FC<ExportLoadingModalProps> = ({
         [fluidType],
         undefined,
         undefined,
-        false
+        false,
+        true
       )
       if (dataLoad && dataLoad.actualData) {
         const exportDataFluid: any = {}
diff --git a/src/services/consumption.service.ts b/src/services/consumption.service.ts
index a3e19edf3a085e4ff9d6322f7da2e06251714c39..d43d3533e431c6288438417767be601ebd980e85 100644
--- a/src/services/consumption.service.ts
+++ b/src/services/consumption.service.ts
@@ -46,6 +46,7 @@ export default class ConsumptionDataManager {
    * @param fluidStatus FluidStatus[]
    * @param compareTimePeriod - Optional TimePeriod
    * @param isHome - Optional boolean
+   * @param isExport - Optional boolean
    * @returns DataChart | null
    */
   public async getGraphData(
@@ -54,14 +55,16 @@ export default class ConsumptionDataManager {
     fluidTypes: FluidType[],
     fluidStatus?: FluidStatus[],
     compareTimePeriod?: TimePeriod,
-    isHome?: boolean
+    isHome?: boolean,
+    isExport?: boolean
   ): Promise<Datachart | null> {
     const InputisValid: boolean =
       this._consumptionValidatorService.ValidateGetGraphData(
         timePeriod,
         timeStep,
         fluidTypes,
-        compareTimePeriod
+        compareTimePeriod,
+        isExport
       )
     if (!InputisValid) return null
     if (fluidTypes.length === 1 && !isHome) {
diff --git a/src/services/consumptionValidator.service.ts b/src/services/consumptionValidator.service.ts
index 675baa4f179b51e58cfdba5cb43f82f8f8c50bca..6da879afd3901fe3764f4c0afdfdaa62f30a889b 100644
--- a/src/services/consumptionValidator.service.ts
+++ b/src/services/consumptionValidator.service.ts
@@ -8,7 +8,8 @@ export default class ConsumptionValidatorService {
     timePeriod: TimePeriod,
     timeStep: TimeStep,
     fluidTypes: FluidType[],
-    compareTimePeriod?: TimePeriod
+    compareTimePeriod?: TimePeriod,
+    isExport?: Boolean
   ): boolean {
     if (fluidTypes.length === 0) return false
     if (!this.ValidateTimePeriod(timePeriod)) return false
@@ -21,7 +22,8 @@ export default class ConsumptionValidatorService {
         return false
     }
 
-    if (!this.ValidateTimePeriodLength(timePeriod, timeStep)) return false
+    if (!isExport && !this.ValidateTimePeriodLength(timePeriod, timeStep))
+      return false
 
     if (compareTimePeriod) {
       if (!this.ValidateTimePeriod(compareTimePeriod)) return false