diff --git a/src/components/pdf_generation/GenerateRunnerCertificates.svelte b/src/components/pdf_generation/GenerateRunnerCertificates.svelte
index 73255b41..a250cd6d 100644
--- a/src/components/pdf_generation/GenerateRunnerCertificates.svelte
+++ b/src/components/pdf_generation/GenerateRunnerCertificates.svelte
@@ -4,7 +4,7 @@
         DonationService
     } from "@odit/lfk-client-js";
     import Toastify from "toastify-js";
-    export let cards_show = false;
+    export let certificates_show = false;
     export let generate_runners = [];
     export let generate_orgs = [];
     export let generate_teams = [];
@@ -38,9 +38,10 @@
         const current_donations = await DonationService.donationControllerGetAll();
         let certificateRunners = [];
         for (let runner of generate_runners) {
-            runner.distanceDonations = current_donations.find((d) => d.runner?.id == runner.id);
+            runner.distanceDonations = current_donations.find((d) => d.runner?.id == runner.id) || [];
             certificateRunners.push(runner);
         }
+        console.log(certificateRunners)
         fetch(
             `${config.baseurl}/documents/certificates?locale=${locale}&download=true&key=${config.documentserver_key}`,
             {
@@ -218,7 +219,7 @@
     // }
 </script>
 
-{#if cards_show}
+{#if certificates_show}
     <div id="certificates:dropdown" class="relative inline-block">
         <div>
             <button
diff --git a/src/components/runners/RunnersOverview.svelte b/src/components/runners/RunnersOverview.svelte
index 6a740f74..06c1f0a8 100644
--- a/src/components/runners/RunnersOverview.svelte
+++ b/src/components/runners/RunnersOverview.svelte
@@ -10,6 +10,7 @@
   import Select from "svelte-select";
   import GenerateSponsoringContracts from "../pdf_generation/GenerateSponsoringContracts.svelte";
   import GenerateRunnerCards from "../pdf_generation/GenerateRunnerCards.svelte";
+  import GenerateRunnerCertificates from "../pdf_generation/GenerateRunnerCertificates.svelte";
   $: searchvalue = "";
   $: active_deletes = [];
   export let current_runners = [];
@@ -27,6 +28,9 @@
   $: cards_show = current_runners.some(
     (r) => r.is_selected === true
   );
+  $: certificates_show = current_runners.some(
+    (r) => r.is_selected === true
+  );
   $: generate_runners = current_runners.filter((r) => r.is_selected === true);
   $: teams = [];
   $: orgs = [];
@@ -92,6 +96,9 @@
         <GenerateRunnerCards
           bind:cards_show
           bind:generate_runners />
+        <GenerateRunnerCertificates
+          bind:certificates_show
+          bind:generate_runners />
       </div>
       <div
         class="shadow border-b border-gray-200 sm:rounded-lg overflow-x-scroll">