diff --git a/src/components/Konnector/KonnectorModalFooter.tsx b/src/components/Konnector/KonnectorModalFooter.tsx
index 2023ed972c3f722676cdf813c66c8fdfe081bb36..69faad6e0046c4d7569b9f25e3399b6e0202c369 100644
--- a/src/components/Konnector/KonnectorModalFooter.tsx
+++ b/src/components/Konnector/KonnectorModalFooter.tsx
@@ -68,16 +68,6 @@ const KonnectorModalFooter = ({
         <div>{t('konnector_modal.button_try_again')}</div>
       </Button>
     )
-  } else if (error === KonnectorError.CHALLENGE_ASKED) {
-    return (
-      <Button
-        aria-label={t('konnector_modal.accessibility.button_close')}
-        onClick={() => handleCloseClick(state === SUCCESS_EVENT)}
-        className="btnPrimary"
-      >
-        <div>{t('konnector_modal.button_come_back_later')}</div>
-      </Button>
-    )
   } else if (error === KonnectorError.TERMS_VERSION_MISMATCH) {
     return (
       <div className="buttons">
diff --git a/src/components/Konnector/KonnectorViewerCard.tsx b/src/components/Konnector/KonnectorViewerCard.tsx
index 91096b619b35cdc7b282dcaa19b014b05f7f02f1..fb011aed8836b721a8e74ece7acdafc14839543a 100644
--- a/src/components/Konnector/KonnectorViewerCard.tsx
+++ b/src/components/Konnector/KonnectorViewerCard.tsx
@@ -183,11 +183,17 @@ const KonnectorViewerCard = ({
       const isEnedisCodeInseeError =
         !isUpdating && fluidType === FluidType.ELECTRICITY
 
+      const isGRDFError =
+        fluidType === FluidType.GAS &&
+        (konnectorErrorDescription === KonnectorError.MAINTENANCE ||
+          konnectorErrorDescription === KonnectorError.VENDOR_DOWN ||
+          konnectorErrorDescription ===
+            KonnectorError.USER_ACTION_NEEDED_CGU_FORM)
+
       const shouldDeleteAccount =
         account &&
         !isSuccess &&
-        account &&
-        (isGlobalLoginFailed || isEnedisCodeInseeError)
+        (isGlobalLoginFailed || isEnedisCodeInseeError || isGRDFError)
 
       if (shouldDeleteAccount) {
         logApp('info', `shouldDeleteAccount`)
diff --git a/src/enums/fluid.enum.ts b/src/enums/fluid.enum.ts
index e0d99c964422498efa7e84da07bccf184a746b84..4ebd4f94525810c87fda0386281482ef393b0a4b 100644
--- a/src/enums/fluid.enum.ts
+++ b/src/enums/fluid.enum.ts
@@ -5,6 +5,7 @@ export enum FluidType {
   MULTIFLUID = 3,
 }
 
+/** Application state for fluid, managed by the FluidService */
 export enum FluidState {
   KONNECTOR_NOT_FOUND = 'KONNECTOR_NOT_FOUND',
   NOT_CONNECTED = 'NOT_CONNECTED',
diff --git a/src/enums/konnectorStatus.enum.ts b/src/enums/konnectorStatus.enum.ts
index ca1975dae2695c73ce407198441602ff49f2b1f5..4ff5dad28d62214d0acf6e009c3f95577ea2ea26 100644
--- a/src/enums/konnectorStatus.enum.ts
+++ b/src/enums/konnectorStatus.enum.ts
@@ -1,3 +1,4 @@
+/** Raw errors from konnector */
 export enum KonnectorError {
   LOGIN_FAILED = 'LOGIN_FAILED',
   USER_ACTION_NEEDED = 'USER_ACTION_NEEDED',
@@ -7,6 +8,9 @@ export enum KonnectorError {
   CRITICAL = 'exit status 1',
   MISSING_SECRET = "Cannot read property 'secret' of null",
   USER_ACTION_NEEDED_ACCOUNT_REMOVED = 'USER_ACTION_NEEDED.ACCOUNT_REMOVED',
+  USER_ACTION_NEEDED_CGU_FORM = 'USER_ACTION_NEEDED.CGU_FORM',
+  VENDOR_DOWN = 'VENDOR_DOWN',
+  MAINTENANCE = 'MAINTENANCE',
 }
 
 export enum KonnectorUpdate {
diff --git a/src/locales/fr.json b/src/locales/fr.json
index 81db76e0d51ef5699c268eb65c7358ac91aefebc..e81e81f36882b7299ca46eadb398b401a5318df4 100644
--- a/src/locales/fr.json
+++ b/src/locales/fr.json
@@ -856,7 +856,6 @@
     "button_check_info": "Vérifier les infos",
     "button_go": "J'y vais",
     "button_later": "Plus tard",
-    "button_come_back_later": "Revenir plus tard",
     "show_common_error": "Voir les erreurs récurrentes",
     "show_common_error_list": "<span>Le problème peut provenir des cas suivants :</span><ul><li>Vous avez un co-titulaire sur votre contrat. Veillez à bien entrer le nom du <span class=\"gold\">titulaire du contrat</span> et non le co-titulaire.</li><li>  Votre nom comporte un tiret\u00a0? Tentez sans le tiret.</li><li>Entrez bien le nom de votre commune de résidence en entier (tirets et accents inclus)</li><li>Avez-vous bien entré le <span class=\"gold\">numéro de votre compteur</span> (PDL)\u00a0? Tout autre numéro (de contrat, de client) ne fonctionne pas.</li></ul><p>Si vous rencontrez toujours des difficultés, contactez notre service d'aide </p><div class=\"center\">Avez-vous pensez à vérifier ces informations\u00a0?</div>",
     "accessibility": {