diff --git a/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html b/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html
index 433112f61..2c6a40653 100644
--- a/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html
+++ b/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html
@@ -280,9 +280,11 @@
                     </ion-item>
                 </ng-container>
 
-                <addon-mod-assign-feedback-plugin *ngFor="let plugin of feedback!.plugins" [assign]="assign"
-                    [submission]="userSubmission" [userId]="submitId" [plugin]="plugin" [canEdit]="canSaveGrades">
-                </addon-mod-assign-feedback-plugin>
+                <ng-container *ngIf="feedback">
+                    <addon-mod-assign-feedback-plugin *ngFor="let plugin of feedback.plugins" [assign]="assign"
+                        [submission]="userSubmission" [userId]="submitId" [plugin]="plugin" [canEdit]="canSaveGrades">
+                    </addon-mod-assign-feedback-plugin>
+                </ng-container>
 
                 <!-- Workflow status. -->
                 <ion-item class="ion-text-wrap" *ngIf="workflowStatusTranslationId">
@@ -338,7 +340,7 @@
                 </ion-item>
 
                 <!-- Grader is hidden, display only the grade date. -->
-                <ion-item class="ion-text-wrap" *ngIf="!grader && feedback!.gradeddate">
+                <ion-item class="ion-text-wrap" *ngIf="!grader && feedback?.gradeddate">
                     <ion-label>
                         <h2>{{ 'addon.mod_assign.gradedon' | translate }}</h2>
                         <p>{{ feedback!.gradeddate * 1000 | coreFormatDate }}</p>
diff --git a/src/addons/mod/assign/components/submission/submission.ts b/src/addons/mod/assign/components/submission/submission.ts
index baa9981b8..a59db45c3 100644
--- a/src/addons/mod/assign/components/submission/submission.ts
+++ b/src/addons/mod/assign/components/submission/submission.ts
@@ -671,8 +671,8 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can
                 AddonModAssign.getSubmissionGradingStatusTranslationId(this.grade.gradingStatus);
         }
 
-        if (this.lastAttempt?.gradingstatus == 'graded' && !this.assign!.markingworkflow && this.userSubmission) {
-            if (this.feedback!.gradeddate < this.userSubmission.timemodified) {
+        if (this.lastAttempt?.gradingstatus == 'graded' && !this.assign!.markingworkflow && this.userSubmission && feedback) {
+            if (feedback.gradeddate < this.userSubmission.timemodified) {
                 this.lastAttempt.gradingstatus = AddonModAssignProvider.GRADED_FOLLOWUP_SUBMIT;
 
                 // Get grading text and color.