diff --git a/client/src/pages/competence/CompetenceCertificateListPage.vue b/client/src/pages/competence/CompetenceCertificateListPage.vue
index 40e0008b..31694b1d 100644
--- a/client/src/pages/competence/CompetenceCertificateListPage.vue
+++ b/client/src/pages/competence/CompetenceCertificateListPage.vue
@@ -45,15 +45,15 @@ const assignments = computed(() => {
 });
 
 const totalPointsEvaluatedAssignments = computed(() => {
-  return assignmentsMaxEvaluationPoints(assignments.value);
+  return assignmentsMaxEvaluationPoints(assignments.value ?? []);
 });
 
 const userPointsEvaluatedAssignments = computed(() => {
-  return assignmentsUserPoints(assignments.value);
+  return assignmentsUserPoints(assignments.value ?? []);
 });
 
 const numAssignmentsEvaluated = computed(() => {
-  return assignments.value.filter((a) => {
+  return (assignments.value ?? []).filter((a) => {
     return a.completion?.completion_status === "EVALUATION_SUBMITTED";
   }).length;
 });
diff --git a/client/src/services/competence.ts b/client/src/services/competence.ts
index 53793917..78689005 100644
--- a/client/src/services/competence.ts
+++ b/client/src/services/competence.ts
@@ -59,5 +59,5 @@ export function getCertificates(
     console.error("Data structure is not recognized!");
     return null;
   }
-  return certificates ?? null;
+  return (certificates as unknown as CompetenceCertificateListObjectType) ?? null;
 }