diff --git a/apps/dafa-web/src/app/pages/deltagare/pages/deltagare-card/deltagare-card.component.html b/apps/dafa-web/src/app/pages/deltagare/pages/deltagare-card/deltagare-card.component.html
index 2c4661a..24f31b4 100644
--- a/apps/dafa-web/src/app/pages/deltagare/pages/deltagare-card/deltagare-card.component.html
+++ b/apps/dafa-web/src/app/pages/deltagare/pages/deltagare-card/deltagare-card.component.html
@@ -48,7 +48,10 @@
                   <ng-container *ngIf="deltagare.disabilities; else emptyDD">
                     <dd *ngFor="let disability of deltagare.disabilities">
                       <span>{{ disability.title }}</span>
-                      <digi-ng-popover class="deltagare-card__popover" [afRelativeIconSize]="true"
+                      <digi-ng-popover
+                        *ngIf="disability.description"
+                        class="deltagare-card__popover"
+                        [afRelativeIconSize]="true"
                         >{{ disability.description }}</digi-ng-popover
                       >
                     </dd>
diff --git a/apps/dafa-web/src/app/shared/models/disability.model.ts b/apps/dafa-web/src/app/shared/models/disability.model.ts
index 8999158..ab9a23f 100644
--- a/apps/dafa-web/src/app/shared/models/disability.model.ts
+++ b/apps/dafa-web/src/app/shared/models/disability.model.ts
@@ -10,7 +10,7 @@ export function mapResponseToDisability(data: DisabilityResponse): Disability {
   const { kod, funktionsnedsattning, beskrivning } = data;
   return {
     code: kod,
-    title: funktionsnedsattning, // TODO: Needed from API
-    description: beskrivning, //TODO: Needed from API
+    title: funktionsnedsattning,
+    description: beskrivning,
   };
 }
diff --git a/apps/dafa-web/src/app/shared/services/api/deltagare.service.ts b/apps/dafa-web/src/app/shared/services/api/deltagare.service.ts
index c7a42e8..bb935f9 100644
--- a/apps/dafa-web/src/app/shared/services/api/deltagare.service.ts
+++ b/apps/dafa-web/src/app/shared/services/api/deltagare.service.ts
@@ -91,28 +91,16 @@ export class DeltagareService {
 
   private _fetchDisabilities$(id: string): Observable<Disability[]> {
     return this.httpClient
-      .get<{ data: DisabilityResponse[][] }>(`${this._apiBaseUrl}/work/disability/${id}`, { ...API_HEADERS })
+      .get<{ data: DisabilityResponse[] }>(`${this._apiBaseUrl}/work/disability/${id}`, { ...API_HEADERS })
       .pipe(
         map(response =>
           response.data.length
-            ? response.data[0].map(funktionsnedsattning => mapResponseToDisability(funktionsnedsattning))
+            ? response.data.map(funktionsnedsattning => mapResponseToDisability(funktionsnedsattning))
             : []
         )
       );
   }
-  // private _fetchDisabilities$(id: string): Observable<Disability[]> {
-  //   return this.httpClient
-  //     .get<{ data: DisabilitiesResponse }>(`${this._apiBaseUrl}/work/disability/${id}`, { ...API_HEADERS })
-  //     .pipe(
-  //       map(respoqnse =>
-  //         response.data.funktionsnedsattningar
-  //           ? response.data.funktionsnedsattningar.map(funktionsnedsattning =>
-  //               mapResponseToDisability(funktionsnedsattning)
-  //             )
-  //           : []
-  //       )
-  //     );
-  // }
+
   private _fetchWorkExperiences$(id: string): Observable<WorkExperience[]> {
     return this.httpClient
       .get<{ data: WorkExperiencesResponse }>(`${this._apiBaseUrl}/work/experience/${id}`, { ...API_HEADERS })
diff --git a/mock-api/dafa-web/scripts/deltagare.js b/mock-api/dafa-web/scripts/deltagare.js
index 888117d..b8a261a 100644
--- a/mock-api/dafa-web/scripts/deltagare.js
+++ b/mock-api/dafa-web/scripts/deltagare.js
@@ -106,11 +106,7 @@ function generateDeltagare(amount = 10) {
               }))
             : [],
       },
-      // disabilities: {
-      //   funktionsnedsattningar: Math.random() > 0.3 ? chooseRandom(DISABILITIES, faker.datatype.number(3)) : [],
-      // },
-      // TODO: Move to different structure. Temporary exposing disabilities in this structure as it is the way the API is exposing the data.
-      disabilities: [Math.random() > 0.3 ? chooseRandom(DISABILITIES, faker.datatype.number(3)) : []],
+      disabilities: Math.random() > 0.3 ? chooseRandom(DISABILITIES, faker.datatype.number(3)) : [],
       workExperiences: {
         arbetslivserfarenheter: chooseRandom(WORK_EXPERIENCES, faker.datatype.number(WORK_EXPERIENCES.length)),
       },