diff --git a/src/components/ContentComponents/ChallengeList/ChallengesList.tsx b/src/components/ContentComponents/ChallengeList/ChallengesList.tsx
index 0a5fbeed1cb1d917696fba1f69841037f9b9cf20..452f8048300d01abc3c9330ea53f0f12a81458ad 100644
--- a/src/components/ContentComponents/ChallengeList/ChallengesList.tsx
+++ b/src/components/ContentComponents/ChallengeList/ChallengesList.tsx
@@ -205,12 +205,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/services/challengeDataManagerService.ts b/src/services/challengeDataManagerService.ts
index 3caae09537dcf2583ddcddd1b08a271eba58abaf..00a32f05a680fb0ac96fcfe03fef4ef3b0cfd381 100644
--- a/src/services/challengeDataManagerService.ts
+++ b/src/services/challengeDataManagerService.ts
@@ -355,9 +355,17 @@ export default class ChallengeManager implements IChallengeManager {
    * the possible calculation of data based on configured fluidTypes
    */
   public getLagDays = (fluidTypes: FluidType[]): number => {
-    if (fluidTypes.includes(FluidType.WATER)) {
+    if (
+      fluidTypes &&
+      fluidTypes.length > 0 &&
+      fluidTypes.includes(FluidType.WATER)
+    ) {
       return 3
-    } else if (fluidTypes.includes(FluidType.GAS)) {
+    } else if (
+      fluidTypes &&
+      fluidTypes.length > 0 &&
+      fluidTypes.includes(FluidType.GAS)
+    ) {
       return 2
     } else {
       return 1
diff --git a/src/services/initDataManagerService.ts b/src/services/initDataManagerService.ts
index 194f9e022b0fd0264057bea3c2f1f8160d08354d..68dcf4b1bd2f240f8a2b981f7ab397902910da39 100644
--- a/src/services/initDataManagerService.ts
+++ b/src/services/initDataManagerService.ts
@@ -421,8 +421,11 @@ export default class InitDataManager {
         ) {
           // Check if we are in the viewing timezone for current challenge
           const viewingDate = cdm.getViewingDate(currentChallenge)
-          if (DateTime.local() >= viewingDate) {
-            if (currentChallenge.maxEnergy === -1) {
+          if (DateTime.local() >= viewingDate && currentChallenge.fluidTypes) {
+            if (
+              currentChallenge.maxEnergy === -1 &&
+              currentChallenge.fluidTypes
+            ) {
               const maxEnergyResult = await cdm.setMaxEnergy(
                 currentChallenge,
                 this._client,