diff --git a/apps/web/src/routes/account.tsx b/apps/web/src/routes/account.tsx
index cf1afa7..7f2c366 100644
--- a/apps/web/src/routes/account.tsx
+++ b/apps/web/src/routes/account.tsx
@@ -312,7 +312,9 @@ function AccountPage() {
 												type="button"
 												disabled={checkoutMutation.isPending}
 												onClick={() =>
-													checkoutMutation.mutate(registration.managementToken!)
+													checkoutMutation.mutate(
+														registration.managementToken ?? "",
+													)
 												}
 												className="inline-flex items-center gap-2 rounded-lg bg-white px-4 py-2 font-semibold text-[#214e51] text-sm transition-colors hover:bg-white/90 disabled:cursor-not-allowed disabled:opacity-50"
 											>
diff --git a/apps/web/src/routes/api/webhook/mollie.ts b/apps/web/src/routes/api/webhook/mollie.ts
index 198f227..6031d58 100644
--- a/apps/web/src/routes/api/webhook/mollie.ts
+++ b/apps/web/src/routes/api/webhook/mollie.ts
@@ -211,7 +211,7 @@ async function handleWebhook({ request }: { request: Request }) {
 		sendPaymentConfirmationEmail({
 			to: regRow.email,
 			firstName: regRow.firstName,
-			managementToken: regRow.managementToken!,
+			managementToken: regRow.managementToken ?? registrationToken,
 			drinkCardValue: regRow.drinkCardValue ?? undefined,
 			giftAmount: regRow.giftAmount ?? undefined,
 		}).catch((err) =>