diff --git a/src/services/quiz.service.ts b/src/services/quiz.service.ts
index 3f2a47705b39cc1eaa862326aea78558439b2538..9c81bba29208dcfa73367f0168e9df5693877fa2 100644
--- a/src/services/quiz.service.ts
+++ b/src/services/quiz.service.ts
@@ -7,7 +7,6 @@ import {
   Answer,
   CustomPeriod,
   CustomQuestionEntity,
-  Datachart,
   IntervalAnswer,
   QuestionEntity,
   QuizEntity,
@@ -429,9 +428,22 @@ export default class QuizService {
 
       if (max == -1) {
         const newInterval: TimePeriod = interval
+
+        let objectTimeStep: object
+        switch (timeStep) {
+          case TimeStep.MONTH:
+            objectTimeStep = { month: 1 }
+            break
+          case TimeStep.YEAR:
+            objectTimeStep = { year: 1 }
+            break
+          default:
+            objectTimeStep = { week: 1 }
+        }
+
         do {
-          newInterval.startDate = newInterval.startDate.minus({ week: 1 })
-          newInterval.endDate = newInterval.endDate.minus({ week: 1 })
+          newInterval.startDate = newInterval.startDate.minus(objectTimeStep)
+          newInterval.endDate = newInterval.endDate.minus(objectTimeStep)
           graphData = await consumptionService.getGraphData(
             interval,
             timeStep,