diff --git a/src/components/Consumption/ConsumptionView.tsx b/src/components/Consumption/ConsumptionView.tsx
index 9515f5921a086cc7bf188b2e15ebd8fef83dc3f1..44767d0bc0efa5ebef61ff0680f789b2ef31b407 100644
--- a/src/components/Consumption/ConsumptionView.tsx
+++ b/src/components/Consumption/ConsumptionView.tsx
@@ -210,6 +210,9 @@ const ConsumptionView = ({ fluidType }: { fluidType: FluidType }) => {
     dispatch(setCurrentIndex(updatedIndex))
   }
 
+  const isGRDFWaitingForConsent =
+    fluidType === FluidType.GAS &&
+    currentFluidStatus.status === FluidState.CHALLENGE_ASKED
   return (
     <>
       <CozyBar titleKey="common.title_consumption" />
@@ -226,26 +229,20 @@ const ConsumptionView = ({ fluidType }: { fluidType: FluidType }) => {
       <Content>
         <FluidButtons activeFluid={fluidType} key={updateKey} />
 
-        {fluidType === FluidType.GAS &&
-          currentFluidStatus.status === FluidState.CHALLENGE_ASKED && (
-            <GrdfWaitConsent />
-          )}
-
-        {showOfflineData && (
-          <>
-            <FluidChart fluidType={fluidType} key={lastDataDateKey} />
-            <ConsumptionDetails fluidType={fluidType} />
-          </>
-        )}
-
-        {!isMulti && (
-          <KonnectorViewerCard
-            fluidType={fluidType}
-            showOfflineData={showOfflineData}
-          />
+        {isGRDFWaitingForConsent ? (
+          <GrdfWaitConsent />
+        ) : (
+          showOfflineData && (
+            <>
+              <FluidChart fluidType={fluidType} key={lastDataDateKey} />
+              <ConsumptionDetails fluidType={fluidType} />
+            </>
+          )
         )}
+        {/* TODO maybe move this inside block above  */}
+        {!isMulti && <KonnectorViewerCard fluidType={fluidType} />}
 
-        {!showOfflineData && isMulti && <KonnectorViewerList />}
+        {isMulti && !showOfflineData && <KonnectorViewerList />}
       </Content>
 
       {/* MODALS */}
diff --git a/src/components/Konnector/KonnectorViewerCard.tsx b/src/components/Konnector/KonnectorViewerCard.tsx
index 518f66338b7c17d16ae17872001ef4461fc77a0d..6210f63c7217d309ecca54bdb71c52f6b3ba3459 100644
--- a/src/components/Konnector/KonnectorViewerCard.tsx
+++ b/src/components/Konnector/KonnectorViewerCard.tsx
@@ -59,22 +59,13 @@ import ConnectionNotFound from './ConnectionNotFound/ConnectionNotFound'
 import ConnectionResult from './ConnectionResult/ConnectionResult'
 import './konnectorViewerCard.scss'
 
-interface KonnectorViewerCardProps {
-  /** TODO Get this from store ? */
-  showOfflineData: boolean
-  fluidType: FluidType
-}
-
-const KonnectorViewerCard = ({
-  showOfflineData,
-  fluidType,
-}: KonnectorViewerCardProps) => {
+const KonnectorViewerCard = ({ fluidType }: { fluidType: FluidType }) => {
   const { t } = useI18n()
   const client = useClient()
   const navigate = useNavigate()
   const dispatch = useAppDispatch()
   const {
-    chart: { showConnectionDetails },
+    chart: { showConnectionDetails, showOfflineData },
     challenge: { currentChallenge },
     global: { fluidStatus, shouldRefreshConsent, partnersInfo },
   } = useAppSelector(state => state.ecolyo)