diff --git a/CHANGELOG b/CHANGELOG
index 04acb46f110cb5af771164a095d53a85b0e77294..423ce78acea2a6bdcf45c7411e04d29a8846061a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,7 @@
 minerva-front (18.0.0~beta.4) stable; urgency=medium
   * Bugfix: source map for js was missing (#292)
+  * Bugfix: sometimes project don't have link to disease or organism, this
+    crashed listing of projects after log in (#290)
 
  -- Piotr Gawron <piotr.gawron@uni.lu>  Wed, 02 Oct 2024 13:00:00 +0200
 
diff --git a/src/models/disease.ts b/src/models/disease.ts
index 7152a107591c97797fb840aae640a4f49ac191d0..b83325f70086e89274803983a72e495687a9bb58 100644
--- a/src/models/disease.ts
+++ b/src/models/disease.ts
@@ -2,7 +2,7 @@ import { z } from 'zod';
 
 export const disease = z.object({
   id: z.number().int().positive(),
-  link: z.string().optional(),
+  link: z.string().nullable(),
   type: z.string(),
   resource: z.string(),
   annotatorClassName: z.string(),
diff --git a/src/models/organism.ts b/src/models/organism.ts
index f583456293d3886270327f55285aaa67d8cd90a6..899cbe4695713cc4011f3055462f74ac3185ec45 100644
--- a/src/models/organism.ts
+++ b/src/models/organism.ts
@@ -2,7 +2,7 @@ import { z } from 'zod';
 
 export const organism = z.object({
   id: z.number().int().positive(),
-  link: z.string().optional(),
+  link: z.string().nullable(),
   type: z.string(),
   resource: z.string(),
   annotatorClassName: z.string(),
diff --git a/src/redux/project/project.selectors.ts b/src/redux/project/project.selectors.ts
index 7ab9a0c284f2677f824887e702c7f2eaa334b859..c75dc8ac953c67ba22032783b62252bf7c235f3f 100644
--- a/src/redux/project/project.selectors.ts
+++ b/src/redux/project/project.selectors.ts
@@ -47,14 +47,12 @@ export const diseaseNameSelector = createSelector(
   projectData => projectData?.diseaseName,
 );
 
-export const diseaseLinkSelector = createSelector(
-  projectDataSelector,
-  projectData => projectData?.disease?.link,
+export const diseaseLinkSelector = createSelector(projectDataSelector, projectData =>
+  projectData?.disease?.link ? projectData?.disease?.link : undefined,
 );
 
-export const organismLinkSelector = createSelector(
-  projectDataSelector,
-  projectData => projectData?.organism?.link,
+export const organismLinkSelector = createSelector(projectDataSelector, projectData =>
+  projectData?.organism?.link ? projectData?.organism?.link : undefined,
 );
 
 export const organismNameSelector = createSelector(