diff --git a/src/components/pdf_generation/GenerateSponsoringContracts.svelte b/src/components/pdf_generation/GenerateSponsoringContracts.svelte
index 731f5581..05e3ba7c 100644
--- a/src/components/pdf_generation/GenerateSponsoringContracts.svelte
+++ b/src/components/pdf_generation/GenerateSponsoringContracts.svelte
@@ -46,19 +46,24 @@
 
 	async function generateTeamContracts(locale) {
 		toast.loading($_("generating-pdfs"));
+		let totalCount = generate_teams.length;
 		let count = 0;
 		for (const t of generate_teams) {
 			count++;
+			download_details = `${t.parentGroup.name} > ${t.name}`;
 			const runners = await RunnerTeamService.runnerTeamControllerGetRunners(
 				t.id
 			);
-			documentServer
+			await documentServer
 				.generateContracts(runners, locale)
 				.then((blob) => {
 					download(
 						blob,
 						`${$_("sponsorings")}_${t.name}-${locale}-${createId()}.pdf`
 					);
+					if (count === totalCount) {
+						download_modal_open = false;
+					}
 				})
 				.catch((err) => {});
 		}
@@ -82,9 +87,7 @@
 					o.id,
 					true
 				);
-			if (runners.length > 0) {
-				download_details = runners[0].group.name;
-			}
+			download_details = o.name;
 			await documentServer
 				.generateContracts(runners, locale)
 				.then((blob) => {
@@ -99,9 +102,7 @@
 				let runners = await RunnerTeamService.runnerTeamControllerGetRunners(
 					t.id
 				);
-				if (runners.length > 0) {
-					download_details = runners[0].group.name;
-				}
+				download_details = `${o.name} > ${t.name}`;
 				await documentServer
 					.generateContracts(runners, locale)
 					.then((blob) => {
@@ -121,9 +122,9 @@
 		}
 	}
 
-	function generateRunnerContracts(locale) {
+	async function generateRunnerContracts(locale) {
 		toast.loading($_("generating-pdf"));
-		documentServer
+		await documentServer
 			.generateContracts(generate_runners, locale)
 			.then((blob) => {
 				let fileName = `${$_("sponsorings")}-${locale}-${createId()}.pdf`;
@@ -133,6 +134,7 @@
 					}-${locale}-${createId()}.pdf`;
 				}
 				download(blob, fileName);
+				download_modal_open = false;
 			})
 			.catch((err) => {
 				console.error(err);