diff --git a/src/components/pdf_generation/GenerateRunnerCertificates.svelte b/src/components/pdf_generation/GenerateRunnerCertificates.svelte
index b7eb4aae..c93e5395 100644
--- a/src/components/pdf_generation/GenerateRunnerCertificates.svelte
+++ b/src/components/pdf_generation/GenerateRunnerCertificates.svelte
@@ -20,13 +20,13 @@
   export let generate_orgs = [];
   export let generate_teams = [];
 
-  function generateCertificates(locale) {
+  function generateCertificates(locale, include0runners = false) {
     if (generate_orgs.length > 0) {
-      generateOrgCertificates(locale);
+      generateOrgCertificates(locale, include0runners = false);
     } else if (generate_teams.length > 0) {
-      generateTeamCertificates(locale);
+      generateTeamCertificates(locale, include0runners = false);
     } else {
-      generateRunnerCertificates(locale);
+      generateRunnerCertificates(locale, include0runners = false);
     }
   }
   function download(blob, fileName) {
@@ -41,7 +41,7 @@
     toast.success($_("pdf-successfully-generated"));
   }
 
-  async function generateRunnerCertificates(locale) {
+  async function generateRunnerCertificates(locale, include0runners = false) {
     toast.loading($_("generating-pdf"));
     const current_donations =
       (await DonationService.donationControllerGetAll()) || [];
@@ -50,7 +50,15 @@
 	  const linkRunner = await RunnerService.runnerControllerGetOne(runner.id)
       linkRunner.distanceDonations =
         current_donations.filter((d) => d.runner?.id == runner.id) || [];
-      certificateRunners.push(linkRunner);
+      // check if linkRunner.distance is 0, if so, and include0runners is false, skip this runner
+      if (
+        !include0runners &&
+        (linkRunner.distance === 0 || linkRunner.distance === null)
+      ) {
+        continue;
+      } else {
+        certificateRunners.push(linkRunner);
+      }
     }
     documentServer
       .generateCertificates(certificateRunners, locale)
@@ -66,7 +74,7 @@
       .catch((err) => {});
   }
 
-  async function generateTeamCertificates(locale) {
+  async function generateTeamCertificates(locale, include0runners = false) {
     toast.loading($_("generating-pdfs"));
     let count = 0;
     const current_donations =
@@ -80,7 +88,15 @@
       for (let runner of runners) {
         runner.distanceDonations =
           current_donations.filter((d) => d.runner?.id == runner.id) || [];
-        certificateRunners.push(runner);
+        // check if runner.distance is 0, if so, and include0runners is false, skip this runner
+        if (
+          !include0runners &&
+          (runner.distance === 0 || runner.distance === null)
+        ) {
+          continue;
+        } else {
+          certificateRunners.push(runner);
+        }
       }
       documentServer
         .generateCertificates(certificateRunners, locale)
@@ -95,7 +111,7 @@
     }
   }
 
-  async function generateOrgCertificates(locale) {
+  async function generateOrgCertificates(locale, include0runners = false) {
     toast.loading($_("generating-pdfs"));
     const current_donations =
       (await DonationService.donationControllerGetAll()) || [];
@@ -114,7 +130,15 @@
       for (let runner of runners) {
         runner.distanceDonations =
           current_donations.filter((d) => d.runner?.id == runner.id) || [];
-        certificateRunners.push(runner);
+          // check if runner.distance is 0, if so, and include0runners is false, skip this runner
+          if (
+            !include0runners &&
+            (runner.distance === 0 || runner.distance === null)
+          ) {
+            continue;
+          } else {
+            certificateRunners.push(runner);
+          }
       }
       await documentServer
         .generateCertificates(certificateRunners, locale)
@@ -161,20 +185,36 @@
 </script>
 
 {#if certificates_show}
-  <button
-    on:click={() => {
-      generateCertificates("de");
-    }}
-    class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 sm:w-auto sm:text-sm mb-1 lg:mb-0"
-  >
-    {$_("generate-runner-certificates")}: DE
-  </button>
-  <button
-    on:click={() => {
-      generateCertificates("en");
-    }}
-    class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 sm:w-auto sm:text-sm mb-1 lg:mb-0"
-  >
-    {$_("generate-runner-certificates")}: EN
-  </button>
+	<button
+		on:click={() => {
+			generateCertificates("de", true);
+		}}
+		class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 sm:w-auto sm:text-sm mb-1 lg:mb-0"
+	>
+		{$_("generate-runner-certificates")}: DE
+	</button>
+	<button
+		on:click={() => {
+			generateCertificates("de", false);
+		}}
+		class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 sm:w-auto sm:text-sm mb-1 lg:mb-0"
+	>
+		{$_("generate-runner-certificates")}: DE [{$_('exclude_0m_runners_certificate')}]
+	</button>
+	<button
+		on:click={() => {
+			generateCertificates("en", true);
+		}}
+		class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 sm:w-auto sm:text-sm mb-1 lg:mb-0"
+	>
+		{$_("generate-runner-certificates")}: EN
+	</button>
+	<button
+		on:click={() => {
+			generateCertificates("en", false);
+		}}
+		class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 sm:w-auto sm:text-sm mb-1 lg:mb-0"
+	>
+		{$_("generate-runner-certificates")}: EN [{$_('exclude_0m_runners_certificate')}]
+	</button>
 {/if}
diff --git a/src/locales/de.json b/src/locales/de.json
index 6348f466..b5947143 100644
--- a/src/locales/de.json
+++ b/src/locales/de.json
@@ -232,6 +232,7 @@
     "error-whyile-copying-to-clipboard": "Fehler beim Kopieren in die Zwischenablage",
     "error_on_login": "😢Fehler beim Login",
     "everything-concerning-your-profile": "Alles zu deinem Profil",
+    "exclude_0m_runners_certificate": "ohne 0m Läufer",
     "existing-donor": "Existierende Sponsor:in",
     "faq": "FAQ",
     "fast_card_replacement": "Karten-Schnellzusweisung (Mit Mobilgeräteunterstützung)",
diff --git a/src/locales/en.json b/src/locales/en.json
index 0f73a4e3..15f2789b 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -232,6 +232,7 @@
     "error-whyile-copying-to-clipboard": "Error while copying to clipboard",
     "error_on_login": "Error on login",
     "everything-concerning-your-profile": "Everything concerning your profile",
+    "exclude_0m_runners_certificate": "exclude runners without scans",
     "existing-donor": "Existing Donor",
     "faq": "FAQ",
     "fast_card_replacement": "Fast card replacement (with mobile support)",