diff --git a/src/components/runners/RunnersOverview.svelte b/src/components/runners/RunnersOverview.svelte
index 428494bf..cdf33ef9 100644
--- a/src/components/runners/RunnersOverview.svelte
+++ b/src/components/runners/RunnersOverview.svelte
@@ -23,6 +23,8 @@
   import InputElement from "../shared/InputElement.svelte";
   import { groupFilter } from "../shared/tablefilters";
 
+  $: selectedRunners =
+    $table?.getSelectedRowModel().rows.map((row) => row.original) || [];
   $: selected =
     $table?.getSelectedRowModel().rows.map((row) => row.index) || [];
 
@@ -75,7 +77,6 @@
   $: sponsoring_contracts_show = selected.length > 0;
   $: cards_show = selected.length > 0;
   $: certificates_show = selected.length > 0;
-  $: generate_runners = []; //current_runners.filter((r) => r.selected === true);
   $: teams = [];
   $: orgs = [];
   $: mappedteams = teams.map(function (g) {
@@ -138,12 +139,15 @@
     <div class="h-12 mt-2">
       <GenerateSponsoringContracts
         bind:sponsoring_contracts_show
-        bind:generate_runners
+        bind:generate_runners={selectedRunners}
+      />
+      <GenerateRunnerCards
+        bind:cards_show
+        bind:generate_runners={selectedRunners}
       />
-      <GenerateRunnerCards bind:cards_show bind:generate_runners />
       <GenerateRunnerCertificates
         bind:certificates_show
-        bind:generate_runners
+        bind:generate_runners={selectedRunners}
       />
     </div>
     <table class="w-full">