diff --git a/src/pages/course/course-scatter/course-scatter.ts b/src/pages/course/course-scatter/course-scatter.ts
index 03650f6..34e6024 100644
--- a/src/pages/course/course-scatter/course-scatter.ts
+++ b/src/pages/course/course-scatter/course-scatter.ts
@@ -98,7 +98,7 @@ export default class CourseScatter extends Vue
     private series()
     {
         // Create scatter plots
-        let series: any[] = this.course.assignmentTypes.map((type, i) =>
+        let series: any[] = this.course.assignmentTypes.filter(t => t.graded).map((type, i) =>
         {
             return {
                 type: 'scatter',
diff --git a/src/pages/course/type-pie/type-pie.ts b/src/pages/course/type-pie/type-pie.ts
index 5b2966d..b6a6190 100644
--- a/src/pages/course/type-pie/type-pie.ts
+++ b/src/pages/course/type-pie/type-pie.ts
@@ -37,7 +37,7 @@ export default class TypePie extends Vue
                 radius: ['40%', '60%'],
                 center: ['50%', '55%'],
                 label: GraphUtils.pieTextStyle(),
-                data: this.course.assignmentTypes.map((t, i) => {return {
+                data: this.course.assignmentTypes.filter(t => t.graded).map((t, i) => {return {
                     value: t.weight,
                     name: `${t.name}\n${t.weight}%`,
                     itemStyle:
diff --git a/src/pages/course/type-radar/type-radar.ts b/src/pages/course/type-radar/type-radar.ts
index be8a8bf..63b8148 100644
--- a/src/pages/course/type-radar/type-radar.ts
+++ b/src/pages/course/type-radar/type-radar.ts
@@ -23,7 +23,7 @@ export default class TypeRadar extends Vue
      */
     get chartSettings()
     {
-        let min = this.course.assignmentTypes.reduce((min, t) => Math.min(min, t.percent), 100);
+        let min = this.course.assignmentTypes.filter(t => t.graded).reduce((min, t) => Math.min(min, t.percent), 100);
 
         // Create settings
         let settings =
@@ -54,7 +54,7 @@ export default class TypeRadar extends Vue
                         opacity: 0.4
                     }
                 },
-                indicator: this.course.assignmentTypes.map((t, i) => {return {
+                indicator: this.course.assignmentTypes.filter(t => t.graded).map((t, i) => {return {
                     name: `${t.name}\n${t.percent}%`,
                     max: 100,
                     min: min - 30,
@@ -89,7 +89,7 @@ export default class TypeRadar extends Vue
                             },
                             opacity: 0.2
                         },
-                        value: this.course.assignmentTypes.map(t => t.percent)
+                        value: this.course.assignmentTypes.filter(t => t.graded).map(t => t.percent)
                     }
                 ]
             },