diff --git a/src/data/selectors/grades.js b/src/data/selectors/grades.js
index 678b017..2eb6460 100644
--- a/src/data/selectors/grades.js
+++ b/src/data/selectors/grades.js
@@ -83,13 +83,13 @@ const getHeadings = (state) => {
 };
 
 const formatMaxAssignmentGrade = (state, assignmentId, percentGrade) => {
-  if (percentGrade === '100') {
+  if (percentGrade === '100' || !assignmentId) {
     return null;
   }
   return percentGrade;
 };
 const formatMinAssignmentGrade = (state, assignmentId, percentGrade) => {
-  if (percentGrade === '0') {
+  if (percentGrade === '0' || !assignmentId) {
     return null;
   }
   return percentGrade;