diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/components/deltagare-list/deltagare-list-handelser-dialog/deltagare-list-handelser-dialog.component.html b/apps/mina-sidor-fa/src/app/pages/deltagare/components/deltagare-list/deltagare-list-handelser-dialog/deltagare-list-handelser-dialog.component.html
index 4e0f62a..b530f48 100644
--- a/apps/mina-sidor-fa/src/app/pages/deltagare/components/deltagare-list/deltagare-list-handelser-dialog/deltagare-list-handelser-dialog.component.html
+++ b/apps/mina-sidor-fa/src/app/pages/deltagare/components/deltagare-list/deltagare-list-handelser-dialog/deltagare-list-handelser-dialog.component.html
@@ -3,31 +3,42 @@
     Genomförandereferens: <strong>{{deltagare?.genomforandeReferens}}</strong>
   </p>
 
-  <digi-table af-size="s">
-    <table>
-      <caption class="msfa__a11y-sr-only">Lista med alla händelser för {{deltagare?.fullName}}</caption>
-      <thead>
-      <tr>
-        <th scope="col" class="deltagare-list-handelser__heading-row">Inkom</th>
-        <th scope="col" class="deltagare-list-handelser__heading-row">Händelse</th>
-        <th scope="col" class="deltagare-list-handelser__heading-row">Datum för händelse</th>
-        <th scope="col" class="deltagare-list-handelser__heading-row">Datum förklaring</th>
-      </tr>
-      </thead>
-      <tbody>
-      <tr *ngFor="let handelse of deltagareHandelser$ | async">
-        <td class="deltagare-list-handelser__table-cell">{{handelse.receivedDate | date}}</td>
-        <td class="deltagare-list-handelser__table-cell" *ngIf="!handelse.isAvbrott; else isAvbrottCell">
-          {{handelse.description}}</td>
-        <td class="deltagare-list-handelser__table-cell">{{handelse.tidpunkt | date }}</td>
-        <td class="deltagare-list-handelser__table-cell">{{handelse.tidpunktDescription}}</td>
-        <ng-template #isAvbrottCell>
-          <td class="deltagare-list-handelser__avbrott-cell">
-            <msfa-icon [icon]="iconType.WARNING" size="l"></msfa-icon>
-            {{handelse.description}}</td>
-        </ng-template>
-      </tr>
-      </tbody>
-    </table>
+  <digi-table af-size="s" *ngIf="deltagareHandelser$ | async; let deltagareHandelser">
+      <ng-container
+        *ngIf="deltagareHandelser.length > 0; else noEvents"
+      >
+        <table>
+          <caption class="msfa__a11y-sr-only">Lista med alla händelser för {{deltagare?.fullName}}</caption>
+          <thead>
+          <tr>
+            <th scope="col" class="deltagare-list-handelser__heading-row">Inkom</th>
+            <th scope="col" class="deltagare-list-handelser__heading-row">Händelse</th>
+            <th scope="col" class="deltagare-list-handelser__heading-row">Datum för händelse</th>
+            <th scope="col" class="deltagare-list-handelser__heading-row">Datum förklaring</th>
+          </tr>
+          </thead>
+          <tbody>
+
+          <tr *ngFor="let handelse of deltagareHandelser;">
+            <td class="deltagare-list-handelser__table-cell">{{handelse.receivedDate | date}}</td>
+            <td class="deltagare-list-handelser__table-cell" *ngIf="!handelse.isAvbrott; else isAvbrottCell">
+              {{handelse.description}}</td>
+            <td class="deltagare-list-handelser__table-cell">{{handelse.tidpunkt | date }}</td>
+            <td class="deltagare-list-handelser__table-cell">{{handelse.tidpunktDescription}}</td>
+            <ng-template #isAvbrottCell>
+              <td class="deltagare-list-handelser__avbrott-cell">
+                <msfa-icon [icon]="iconType.WARNING" size="l"></msfa-icon>
+                {{handelse.description}}</td>
+            </ng-template>
+          </tr>
+
+
+          </tbody>
+        </table>
+      </ng-container>
   </digi-table>
 </div>
+
+<ng-template #noEvents>
+  Inga händelser har inkommit.
+</ng-template>
diff --git a/apps/mina-sidor-fa/src/app/pages/deltagare/components/deltagare-list/deltagare-list-handelser-dialog/deltagare-list-handelser-dialog.component.ts b/apps/mina-sidor-fa/src/app/pages/deltagare/components/deltagare-list/deltagare-list-handelser-dialog/deltagare-list-handelser-dialog.component.ts
index 1ac4328..005c648 100644
--- a/apps/mina-sidor-fa/src/app/pages/deltagare/components/deltagare-list/deltagare-list-handelser-dialog/deltagare-list-handelser-dialog.component.ts
+++ b/apps/mina-sidor-fa/src/app/pages/deltagare/components/deltagare-list/deltagare-list-handelser-dialog/deltagare-list-handelser-dialog.component.ts
@@ -20,7 +20,7 @@ export class DeltagareListHandelserDialogComponent implements OnInit {
 
   ngOnInit(): void {
     if (this.deltagare) {
-      this.deltagareHandelser$ = this.deltagareHandelserApiService.fetchDeltagareHandelser(
+      this.deltagareHandelser$ = this.deltagareHandelserApiService.fetchDeltagareHandelser$(
         this.deltagare.genomforandeReferens
       );
     }
diff --git a/apps/mina-sidor-fa/src/app/shared/services/api/deltagare-handelser-api.service.ts b/apps/mina-sidor-fa/src/app/shared/services/api/deltagare-handelser-api.service.ts
index 1d1c80c..617da18 100644
--- a/apps/mina-sidor-fa/src/app/shared/services/api/deltagare-handelser-api.service.ts
+++ b/apps/mina-sidor-fa/src/app/shared/services/api/deltagare-handelser-api.service.ts
@@ -9,12 +9,16 @@ import { environment } from '@msfa-environment';
   providedIn: 'root',
 })
 export class DeltagareHandelserApiService {
-  private _apiBaseUrl = `${environment.api.url}/deltagareHandelser`;
+  private _apiBaseUrl = `${environment.api.url}`;
   constructor(private httpClient: HttpClient) {}
 
-  fetchDeltagareHandelser(genomforandereferens: string): Observable<DeltagareHandelse[]> {
+  fetchDeltagareHandelser$(genomforandeReferens: string): Observable<DeltagareHandelse[]> {
+    if (!genomforandeReferens) {
+      throw new Error('Genomförandereferens kunde inte hittas.');
+    }
+
     return this.httpClient
-      .get<DeltagareHandelseApiResponse>(`${this._apiBaseUrl}?genomforandereferens=${genomforandereferens}`)
+      .get<DeltagareHandelseApiResponse>(`${this._apiBaseUrl}/deltagare/${genomforandeReferens}/handelser`)
       .pipe(
         map(({ data }) => {
           if (data) {
diff --git a/mock-api/mina-sidor-fa/server.js b/mock-api/mina-sidor-fa/server.js
index 8b53b0e..1c6b2d6 100644
--- a/mock-api/mina-sidor-fa/server.js
+++ b/mock-api/mina-sidor-fa/server.js
@@ -46,6 +46,7 @@ server.use(
     '/avrop*tjanstKod*': '/avrop$1tjanstekod$2',
     '/deltagare?*': '/avrop?$1',
     '/deltagare/:sokandeId/avrop': '/avrop?sokandeId=:sokandeId',
+    '/deltagare/:genomforandeReferens/handelser': '/deltagareHandelser?genomforandeReferens=:genomforandeReferens',
     '/deltagare/:sokandeId/*': '/deltagare/:sokandeId',
     '*page=*': '$1_page=$2',
     '*limit=*': '$1_limit=$2',