diff --git a/libs/application/template-api-modules/src/lib/modules/templates/european-health-insurance-card/european-health-insurance-card.service.ts b/libs/application/template-api-modules/src/lib/modules/templates/european-health-insurance-card/european-health-insurance-card.service.ts
index 3f8ad5d368b9..46c16ccfed72 100644
--- a/libs/application/template-api-modules/src/lib/modules/templates/european-health-insurance-card/european-health-insurance-card.service.ts
+++ b/libs/application/template-api-modules/src/lib/modules/templates/european-health-insurance-card/european-health-insurance-card.service.ts
@@ -230,9 +230,13 @@ export class EuropeanHealthInsuranceCardService extends BaseTemplateApiService {
 
     for (let i = 0; i < applicants?.length; i++) {
       try {
+        const { nationalId, cardNumber } = applicants[i]
+        if (!nationalId || !cardNumber) {
+          throw new Error('National ID or card number is missing')
+        }
         const res = await this.ehicApiWithAuth(auth).fetchTempEhicPDFCard({
-          applicantnationalid: applicants[i].nationalId ?? '',
-          cardnumber: applicants[i].cardNumber ?? '',
+          applicantnationalid: nationalId,
+          cardnumber: cardNumber,
         })
         pdfArray.push(res)
       } catch (error) {