diff --git a/src/components/ContentComponents/ChallengeList/ChallengesList.tsx b/src/components/ContentComponents/ChallengeList/ChallengesList.tsx
index 0a5fbeed1cb1d917696fba1f69841037f9b9cf20..89d8e1ace26eb274b00bddfdfe212e1cbb819bf7 100644
--- a/src/components/ContentComponents/ChallengeList/ChallengesList.tsx
+++ b/src/components/ContentComponents/ChallengeList/ChallengesList.tsx
@@ -19,9 +19,12 @@ interface ChallengesListProps {
 const ChallengesList: React.FC<ChallengesListProps> = ({
   client,
 }: ChallengesListProps) => {
-  const { fluidTypes, refreshCurrentChallenge, screenType } = useContext(
-    AppContext
-  )
+  const {
+    fluidTypes,
+    refreshCurrentChallenge,
+    screenType,
+    challengeNotification,
+  } = useContext(AppContext)
   const challengeManager = new ChallengeManager(client)
   const [
     ongoingChallenge,
@@ -104,12 +107,7 @@ const ChallengesList: React.FC<ChallengesListProps> = ({
         setOngoingChallenge(ongoingChallengeTmp)
         setOngoingChallengeModal(ongoingChallengeTmp)
         setUserLevel(levelOfUser)
-        if (
-          await challengeManager.isChallengeOver(
-            ongoingChallengeTmp,
-            fluidTypes
-          )
-        ) {
+        if (challengeNotification) {
           setOpenChallengeModal(true)
           await challengeManager.endChallenge(ongoingChallengeTmp, fluidTypes)
           await refreshCurrentChallenge()
@@ -205,12 +203,14 @@ const ChallengesList: React.FC<ChallengesListProps> = ({
           </div>
         </div>
       )}
-      <ChallengeModal
-        opened={openChallengeModal}
-        challenge={ongoingChallengeModal}
-        handleCloseClick={handleCloseClick}
-        badgeStatus={ongoingChallengeModal && ongoingChallengeModal.badge}
-      />
+      {openChallengeModal && (
+        <ChallengeModal
+          opened={openChallengeModal}
+          challenge={ongoingChallengeModal}
+          handleCloseClick={handleCloseClick}
+          badgeStatus={ongoingChallengeModal && ongoingChallengeModal.badge}
+        />
+      )}
     </>
   )
 }
diff --git a/src/components/Contexts/AppContextProvider.tsx b/src/components/Contexts/AppContextProvider.tsx
index eb8c4828d5f1dcd90ca8297cce730d0cdc1e623a..1cf2982fb3bee221305107e38e6fde79cfa62e40 100644
--- a/src/components/Contexts/AppContextProvider.tsx
+++ b/src/components/Contexts/AppContextProvider.tsx
@@ -79,7 +79,6 @@ const AppContextProvider: React.FC<AppContextProviderProps> = ({
   const [isIndexesLoadingSuccess, setIndexesLoadingSuccess] = useState<
     boolean | null
   >(null)
-
   const [isDataLoading, setDataLoading] = useState<boolean>(false)
   const [isDataLoadingSuccess, setDataLoadingSuccess] = useState<
     boolean | null
@@ -107,7 +106,6 @@ const AppContextProvider: React.FC<AppContextProviderProps> = ({
   const [challengeNotification, setChallengeNotification] = useState<boolean>(
     false
   )
-
   const [isContextLoaded, setContextLoaded] = useState<boolean>(false)
   const [isError, setError] = useState<boolean>(false)
   const [screenType, setScreenType] = useState<ScreenType>(ScreenType.MOBILE)