diff --git a/src/addons/mod/assign/classes/submissions-source.ts b/src/addons/mod/assign/classes/submissions-source.ts
index a1c36e70c..4faec578d 100644
--- a/src/addons/mod/assign/classes/submissions-source.ts
+++ b/src/addons/mod/assign/classes/submissions-source.ts
@@ -211,14 +211,9 @@ export class AddonModAssignSubmissionsSource extends CoreRoutedItemsManagerSourc
                             submission.gradingstatus,
                         );
 
-                        // Show submission status if not submitted for grading.
-                        if (submission.statusColor != 'success' || !submission.gradingstatus) {
-                            submission.statusTranslated = Translate.instant(
-                                'addon.mod_assign.submissionstatus_' + submission.status,
-                            );
-                        } else {
-                            submission.statusTranslated = '';
-                        }
+                        submission.statusTranslated = Translate.instant(
+                            'addon.mod_assign.submissionstatus_' + submission.status,
+                        );
 
                         if (notSynced) {
                             submission.gradingStatusTranslationId = 'addon.mod_assign.gradenotsynced';
diff --git a/src/addons/mod/assign/components/index/index.ts b/src/addons/mod/assign/components/index/index.ts
index 84e64cb19..72b161007 100644
--- a/src/addons/mod/assign/components/index/index.ts
+++ b/src/addons/mod/assign/components/index/index.ts
@@ -302,7 +302,7 @@ export class AddonModAssignIndexComponent extends CoreCourseModuleMainActivityCo
             }
         }
 
-        this.needsGradingAvailable = (submissionStatus.gradingsummary?.submissionsneedgradingcount || 0) > 0;
+        this.needsGradingAvailable = this.summary.submissionsneedgradingcount > 0;
     }
 
     /**
diff --git a/src/addons/mod/assign/pages/submission-list/submission-list.html b/src/addons/mod/assign/pages/submission-list/submission-list.html
index 0a6635371..40ad93441 100644
--- a/src/addons/mod/assign/pages/submission-list/submission-list.html
+++ b/src/addons/mod/assign/pages/submission-list/submission-list.html
@@ -63,14 +63,16 @@
                                     {{ 'addon.mod_assign.defaultteam' | translate }}
                                 </span>
                             </p>
-                            <ion-badge class="ion-text-center ion-text-wrap" [color]="submission.statusColor"
-                                *ngIf="submission.statusTranslated">
-                                {{ submission.statusTranslated }}
-                            </ion-badge>
-                            <ion-badge class="ion-text-center ion-text-wrap" [color]="submission.gradingColor"
-                                *ngIf="submission.gradingStatusTranslationId">
-                                {{ submission.gradingStatusTranslationId | translate }}
-                            </ion-badge>
+                            <p *ngIf="submission.statusTranslated">
+                                <ion-badge class="ion-text-center ion-text-wrap" [color]="submission.statusColor">
+                                    {{ submission.statusTranslated }}
+                                </ion-badge>
+                            </p>
+                            <p *ngIf="submission.gradingStatusTranslationId">
+                                <ion-badge class="ion-text-center ion-text-wrap" [color]="submission.gradingColor">
+                                    {{ submission.gradingStatusTranslationId | translate }}
+                                </ion-badge>
+                            </p>
                         </ion-label>
                     </ion-item>
                 </ng-container>