diff --git a/src/pages/course-selection/course-selection.ts b/src/pages/course-selection/course-selection.ts
index b194902..d08c464 100644
--- a/src/pages/course-selection/course-selection.ts
+++ b/src/pages/course-selection/course-selection.ts
@@ -128,7 +128,9 @@ export default class CourseSelection extends Vue
         return this.courseInfo.filter(c =>
             c.uniqueName.toLowerCase().includes(this.search.toLowerCase()) &&
             c.level != null && c.level !== 'Club' && c.level !== 'Sport' && c.level !== 'None' &&
-            c.year == year && c.gradeLevels.includes(this.app.user.gradeLevel + 1));
+            c.year == year &&
+            (this.settings.showAllCourses || c.gradeLevels.includes(this.app.user.gradeLevel + 1))
+        );
     }
 
     /**