diff --git a/src/addons/mod/workshop/components/index/index.ts b/src/addons/mod/workshop/components/index/index.ts
index c8a255e7a..382a796c0 100644
--- a/src/addons/mod/workshop/components/index/index.ts
+++ b/src/addons/mod/workshop/components/index/index.ts
@@ -291,13 +291,13 @@ export class AddonModWorkshopIndexComponent extends CoreCourseModuleMainActivity
 
         await Promise.all(grades.map(async (grade) => {
             const submission: AddonModWorkshopSubmissionDataWithOfflineData = {
-                id: grade.submissionid,
+                id: grade.submissionid || 0,
                 workshopid: workshop.id,
                 example: false,
                 authorid: grade.userid,
-                timecreated: grade.submissionmodified,
-                timemodified: grade.submissionmodified,
-                title: grade.submissiontitle,
+                timecreated: grade.submissionmodified || 0,
+                timemodified: grade.submissionmodified || 0,
+                title: grade.submissiontitle || '',
                 content: '',
                 contenttrust: 0,
                 attachment: 0,
diff --git a/src/addons/mod/workshop/components/submission/addon-mod-workshop-submission.html b/src/addons/mod/workshop/components/submission/addon-mod-workshop-submission.html
index 68efe5b4e..a239d2aef 100644
--- a/src/addons/mod/workshop/components/submission/addon-mod-workshop-submission.html
+++ b/src/addons/mod/workshop/components/submission/addon-mod-workshop-submission.html
@@ -4,7 +4,7 @@
             <core-user-avatar [user]="profile" [courseId]="courseId" [userId]="profile?.id" slot="start">
             </core-user-avatar>
             <ion-label>
-                <h2>
+                <h2 *ngIf="submission.title">
                     <core-format-text [text]="submission.title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
                     </core-format-text>
                 </h2>
@@ -68,7 +68,7 @@
         <core-user-avatar [user]="profile" slot="start" [courseId]="courseId" [userId]="profile?.id">
         </core-user-avatar>
         <ion-label>
-            <h2>
+            <h2 *ngIf="submission.title">
                 <core-format-text [text]="submission.title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
                 </core-format-text>
             </h2>
diff --git a/src/addons/mod/workshop/services/workshop.ts b/src/addons/mod/workshop/services/workshop.ts
index 582d61195..5e551e376 100644
--- a/src/addons/mod/workshop/services/workshop.ts
+++ b/src/addons/mod/workshop/services/workshop.ts
@@ -1766,9 +1766,9 @@ export type AddonModWorkshoGradesReportData = {
 
 export type AddonModWorkshopGradesData = {
     userid: number; // The id of the user being displayed in the report.
-    submissionid: number; // Submission id.
-    submissiontitle: string; // Submission title.
-    submissionmodified: number; // Timestamp submission was updated.
+    submissionid?: number; // Submission id.
+    submissiontitle?: string; // Submission title.
+    submissionmodified?: number; // Timestamp submission was updated.
     submissiongrade?: number; // Aggregated grade for the submission.
     gradinggrade?: number; // Computed grade for the assessment.
     submissiongradeover?: number; // Grade for the assessment overrided by the teacher.