diff --git a/src/core/clients/opencga/opencga-client.js b/src/core/clients/opencga/opencga-client.js
index 7e53f9244..14952d2fd 100644
--- a/src/core/clients/opencga/opencga-client.js
+++ b/src/core/clients/opencga/opencga-client.js
@@ -418,11 +418,14 @@ export class OpenCGAClient {
                                                     // Fetch all the cohort
                                                     console.log("Fetching cohorts");
                                                     const cohortsResponse = await _this.cohorts()
-                                                        .search({study: study.fqn, exclude: "samples", limit: 100});
+                                                        .search({
+                                                            study: study.fqn,
+                                                            internalStatus: "READY,CALCULATING,INVALID",
+                                                            exclude: "samples",
+                                                            limit: 100,
+                                                        });
                                                     study.cohorts = cohortsResponse.responses[0].results
                                                         .filter(cohort => !cohort.attributes?.IVA?.ignore);
-                                                    // FIXME line above should check cohort.internal instead
-                                                    // .filter(cohort => cohort.internal.index?.status === "READY");
 
                                                     // Keep track of the studies to fetch Disease Panels
                                                     studies.push(study.fqn);