diff --git a/src/components/Connection/ModalGRDF.tsx b/src/components/Connection/ModalGRDF.tsx
index d3b8801422fe154db5b715f9faef61b7c7655da7..4e41235adc6bdee205eea02d07c9e6e6e6007a3c 100644
--- a/src/components/Connection/ModalGRDF.tsx
+++ b/src/components/Connection/ModalGRDF.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react'
+import React from 'react'
 import { useI18n } from 'cozy-ui/transpiled/react/I18n'
 
 import Modal from 'components/CommonKit/Modal/Modal'
@@ -15,25 +15,18 @@ import './modalGRDF.scss'
 
 interface ModalGRDFProps {
   isWaiting?: boolean
-  status: string
-  handleCloseClick: () => void
   handleSubmit: () => void
+  handleCloseClick: () => void
 }
 
 const ModalGRDF: React.FC<ModalGRDFProps> = ({
-  handleCloseClick,
   handleSubmit,
+  handleCloseClick,
   isWaiting,
-  status,
 }: ModalGRDFProps) => {
   const { t } = useI18n()
   const { screenType } = useSelector((state: AppStore) => state.ecolyo.global)
 
-  useEffect(() => {
-    if (status && status === 'idle') {
-      handleCloseClick()
-    }
-  }, [status, handleCloseClick])
   return (
     <Modal handleCloseClick={handleCloseClick}>
       {screenType === ScreenType.MOBILE ? (
diff --git a/src/components/Connection/OAuthForm.tsx b/src/components/Connection/OAuthForm.tsx
index ac86fecb266c6dbaec7df8d0e7152160c33e180d..ede56f234af35c056ccd6d5553a1c08e21f77649 100644
--- a/src/components/Connection/OAuthForm.tsx
+++ b/src/components/Connection/OAuthForm.tsx
@@ -37,6 +37,7 @@ const OAuthForm: React.FC<OAuthFormProps> = ({
   }, [])
 
   const endOAuth = () => {
+    setOpenGRDFModal(false)
     setStatus(IDLE)
   }
   const startOAuth = () => {
@@ -107,10 +108,9 @@ const OAuthForm: React.FC<OAuthFormProps> = ({
       )}
       {openGRDFModal && (
         <ModalGRDF
-          handleCloseClick={toggleGRDFModal}
           handleSubmit={handleSubmit}
+          handleCloseClick={toggleGRDFModal}
           isWaiting={isWaiting}
-          status={status}
         />
       )}
     </>