diff --git a/src/components/app/app.ts b/src/components/app/app.ts
index 9f77679..9a58d5f 100644
--- a/src/components/app/app.ts
+++ b/src/components/app/app.ts
@@ -186,7 +186,7 @@ export default class App extends Vue
         }
 
         // Wait for done
-        pWaitFor(() => this.filteredCourses.every(c => c.grading != undefined)).then(() =>
+        pWaitFor(() => this.filteredCourses.every(c => c.termGrading.every(g => g != null))).then(() =>
         {
             // When the assignments are ready
             this.assignmentsReady = true;