diff --git a/src/components/ContainerComponents/FluidChartContainer/FluidChartContainer.tsx b/src/components/ContainerComponents/FluidChartContainer/FluidChartContainer.tsx
index c2025e75737d9f9324d4e53ff7aa87ef66ff418e..37443b16f4a9888f2388e63a5d3fdbb9fc85fbb8 100644
--- a/src/components/ContainerComponents/FluidChartContainer/FluidChartContainer.tsx
+++ b/src/components/ContainerComponents/FluidChartContainer/FluidChartContainer.tsx
@@ -57,14 +57,15 @@ const FluidChartContainer: React.FC<FluidChartContainerProps> = ({
         true
       )
       if (subscribed && data) {
-        console.log('this is my LASTLASTLASTdata lalala : ', dataWithAllFluids)
         setLastDataDate(data)
         setReferenceDate(data)
       }
       if (subscribed && dataWithAllFluids) {
-        console.log('this is my LAST ALL data lalala : ', dataWithAllFluids)
         setLastDateWithAllData(dataWithAllFluids)
       }
+      if (subscribed && isMinute) {
+        setMinuteActive(true)
+      }
       if (subscribed && currentChallenge) {
         if (
           currentChallenge.challengeType &&
@@ -118,6 +119,7 @@ const FluidChartContainer: React.FC<FluidChartContainerProps> = ({
               lastDateWithAllData={lastDateWithAllData}
               fluidTypes={fluidTypes}
               timeStep={timeStep}
+              halfHourLoad={isMinuteActive}
               multiFluid={multiFluid}
               currentChallenge={challenge}
               consumptionDataManager={consumptionDataManager}
diff --git a/src/components/ContentComponents/ConsumptionVisualizer/ConsumptionVisualizer.tsx b/src/components/ContentComponents/ConsumptionVisualizer/ConsumptionVisualizer.tsx
index ba2bbf628b945f62aa212fb8419a56fa079d93ac..d45ca5042da8134ae5d2beaadc59081b4e53e99e 100644
--- a/src/components/ContentComponents/ConsumptionVisualizer/ConsumptionVisualizer.tsx
+++ b/src/components/ContentComponents/ConsumptionVisualizer/ConsumptionVisualizer.tsx
@@ -10,7 +10,6 @@ import DataloadConsumptionVisualizer from 'components/ContentComponents/Consumpt
 import DetailedConsumptionVisualizer from 'components/ContentComponents/ConsumptionVisualizer/DetailedConsumptionVisualizer'
 import LastDataConsumptionVisualizer from 'components/ContentComponents/ConsumptionVisualizer/LastDataConsumptionVisualizer'
 import ErrorDataConsumptionVisualizer from 'components/ContentComponents/ConsumptionVisualizer/ErrorDataConsumptionVisualizer'
-import ActivateHalfHourLoad from '../ConsumptionNavigator/ActivateHalfHourLoad'
 
 interface ConsumptionVisualizerProps {
   fluidTypes: FluidType[]
@@ -67,54 +66,40 @@ const ConsumptionVisualizer = ({
         isLoaded={isLoaded}
       />
       <div className="cv-info">
-        {timeStep === 10 ? (
-          !dataload ||
-          (dataload && dataload.value === -1 && (
-            <ActivateHalfHourLoad timeStep={timeStep} />
-          ))
-        ) : (
-          <div>
-            {!multiFluid && dataload && dataload.value > -1 && (
-              <DetailedConsumptionVisualizer
-                fluidTypes={fluidTypes}
-                timeStep={timeStep}
-                multiFluid={multiFluid}
-                handleClickDetails={handleClickDetails}
-              />
-            )}
-            {dataload &&
-              dataload.valueDetail &&
-              ((dataload.valueDetail[0] === -1 &&
-                !isDataToCome(dataload, fluidTypes[0])) ||
-                (dataload.valueDetail[1] === -1 &&
-                  !isDataToCome(dataload, fluidTypes[1])) ||
-                (dataload.valueDetail[2] === -1 &&
-                  !isDataToCome(dataload, fluidTypes[2]))) && (
-                <ErrorDataConsumptionVisualizer
-                  date={date}
-                  indexDisplayed={indexDisplayed}
-                  setIndexDisplayed={setIndexDisplayed}
-                  lastDateWithAllData={lastDateWithAllData}
-                  setSelectedDate={setSelectedDate}
-                />
-              )}
-            {!dataload ||
-              (dataload && dataload.value === -1 && (
-                <LastDataConsumptionVisualizer
-                  fluidTypes={fluidTypes}
-                  timeStep={timeStep}
-                  multiFluid={multiFluid}
-                  handleChangeIndex={handleChangeIndex}
-                />
-              ))}
-          </div>
+        {!multiFluid && dataload && dataload.value > -1 && (
+          <DetailedConsumptionVisualizer
+            fluidTypes={fluidTypes}
+            timeStep={timeStep}
+            multiFluid={multiFluid}
+            handleClickDetails={handleClickDetails}
+          />
         )}
+        {dataload &&
+          dataload.valueDetail &&
+          ((dataload.valueDetail[0] === -1 &&
+            !isDataToCome(dataload, fluidTypes[0])) ||
+            (dataload.valueDetail[1] === -1 &&
+              !isDataToCome(dataload, fluidTypes[1])) ||
+            (dataload.valueDetail[2] === -1 &&
+              !isDataToCome(dataload, fluidTypes[2]))) && (
+            <ErrorDataConsumptionVisualizer
+              date={date}
+              indexDisplayed={indexDisplayed}
+              setIndexDisplayed={setIndexDisplayed}
+              lastDateWithAllData={lastDateWithAllData}
+              setSelectedDate={setSelectedDate}
+            />
+          )}
+        {!dataload ||
+          (dataload && dataload.value === -1 && (
+            <LastDataConsumptionVisualizer
+              fluidTypes={fluidTypes}
+              timeStep={timeStep}
+              multiFluid={multiFluid}
+              handleChangeIndex={handleChangeIndex}
+            />
+          ))}
       </div>
-      {/* {timeStep === 10 && (
-      !dataload ||
-      (dataload && dataload.value === -1 && (
-        <ActivateHalfHourLoad timeStep={timeStep} />
-      )))} */}
     </div>
   )
 }
diff --git a/src/components/ContentComponents/FluidChart/FluidChartContent.tsx b/src/components/ContentComponents/FluidChart/FluidChartContent.tsx
index 35844b1d21eb91779a5505a8a59a12a8675c3df5..e13edcfbe2ef533840d1d15f7445d4677aba4668 100644
--- a/src/components/ContentComponents/FluidChart/FluidChartContent.tsx
+++ b/src/components/ContentComponents/FluidChart/FluidChartContent.tsx
@@ -23,6 +23,7 @@ import ConsumptionVisualizer from 'components/ContentComponents/ConsumptionVisua
 
 import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
 import captionIcon from 'assets/icons/visu/challenge-caption-chart.svg'
+import ActivateHalfHourLoad from '../ConsumptionNavigator/ActivateHalfHourLoad'
 
 interface FluidChartContentProps {
   fluidTypes: FluidType[]
@@ -30,6 +31,7 @@ interface FluidChartContentProps {
   referenceDate: DateTime
   lastDataDate: DateTime
   lastDateWithAllData: DateTime
+  halfHourLoad: boolean
   multiFluid: boolean
   currentChallenge: UserChallenge | null
   consumptionDataManager: IConsumptionDataManager
@@ -45,6 +47,7 @@ const FluidChartContent: React.FC<FluidChartContentProps> = ({
   lastDataDate,
   lastDateWithAllData,
   multiFluid,
+  halfHourLoad,
   currentChallenge,
   consumptionDataManager,
   isDataLoaded,
@@ -59,7 +62,6 @@ const FluidChartContent: React.FC<FluidChartContentProps> = ({
   >()
   const [showCompare, setShowCompare] = useState<boolean>(false)
   const [isLoaded, setIsLoaded] = useState<boolean>(true)
-
   const challengePeriod: ITimePeriod | null =
     currentChallenge &&
     currentChallenge.startingDate &&
@@ -140,6 +142,11 @@ const FluidChartContent: React.FC<FluidChartContentProps> = ({
           handleChangeIndex={handleChangeIndex}
         />
       </div>
+
+      {!halfHourLoad && timeStep === 10 && (
+        <ActivateHalfHourLoad timeStep={timeStep} />
+      )}
+
       {isDataLoaded && (
         <FluidChartSwipe
           fluidTypes={fluidTypes}
diff --git a/src/services/consumptionDataManagerService.ts b/src/services/consumptionDataManagerService.ts
index 2bc7d627d3a9f385f1d8c156155ca348bc9f8b9f..26a51ea0edcd004456cb609c778ca08420ec1ccf 100644
--- a/src/services/consumptionDataManagerService.ts
+++ b/src/services/consumptionDataManagerService.ts
@@ -257,7 +257,6 @@ export default class ConsumptionDataManager implements IConsumptionDataManager {
     fluidTypes: FluidType[],
     allFluids?: boolean
   ): Promise<DateTime | null> {
-    console.log('you called fetchlastdataDATA')
     let lastDay = null
     if (fluidTypes.length === 1) {
       lastDay = (await this._queryRunner.getLastDateData(fluidTypes[0])) || null
@@ -291,9 +290,11 @@ export default class ConsumptionDataManager implements IConsumptionDataManager {
   public async checkDoctypeEntries(
     fluideType: FluidType[],
     timeStep: TimeStep
-  ) {
+  ): Promise<boolean> {
     //GET RELEVANT DOCTYPE
     //QUERY RUNNER THIS DOCTYPE AND CHECK LENGTH
+    const queryResult = await this._queryRunner.getEntries(fluideType, timeStep)
+    return false
   }
 
   private aggregateGraphData(
diff --git a/src/services/queryRunnerService.ts b/src/services/queryRunnerService.ts
index 81644decd55540a1f9f5696e042461e51e8cbc8b..ccbe94a52b4794a2d264fb63edff1141c15e9e3e 100644
--- a/src/services/queryRunnerService.ts
+++ b/src/services/queryRunnerService.ts
@@ -112,6 +112,16 @@ export class QueryRunner {
     return result
   }
 
+  public async getEntries(fluidType: FluidType[], timeStep: TimeStep) {
+    let result = null
+    try {
+      result = await this._client.find(ENEDIS_DAY_DOCTYPE).where({})
+    } catch (error) {
+      return null
+    }
+    return result
+  }
+
   private filterDataList(data, timePeriod: ITimePeriod) {
     const filteredResult = data.data.filter(entry =>
       this.withinDateBoundaries(