diff --git a/src/course-home/progress-tab/grades/course-grade/CourseGradeFooter.jsx b/src/course-home/progress-tab/grades/course-grade/CourseGradeFooter.jsx
index 6cada4cbb4..febc28b88e 100644
--- a/src/course-home/progress-tab/grades/course-grade/CourseGradeFooter.jsx
+++ b/src/course-home/progress-tab/grades/course-grade/CourseGradeFooter.jsx
@@ -48,10 +48,10 @@ const CourseGradeFooter = ({ passingGrade }) => {
   const courseId = useContextId();
 
   const {
-    assignmentTypeGradeSummary,
-    courseGrade: { isPassing, letterGrade },
-    gradingPolicy: { gradeRange },
-  } = useModel('progress', courseId);
+    assignmentTypeGradeSummary = [],
+    courseGrade: { isPassing, letterGrade } = {},
+    gradingPolicy: { gradeRange = {} } = {},
+  } = useModel('progress', courseId) || { courseGrade: {}, gradingPolicy: {} };
 
   const latestDueDate = getLatestDueDateInFuture(assignmentTypeGradeSummary);
   const wideScreen = useWindowSize().width >= breakpoints.medium.minWidth;
diff --git a/src/course-home/progress-tab/grades/course-grade/CurrentGradeTooltip.jsx b/src/course-home/progress-tab/grades/course-grade/CurrentGradeTooltip.jsx
index 8e1c6b2985..c72c1fde60 100644
--- a/src/course-home/progress-tab/grades/course-grade/CurrentGradeTooltip.jsx
+++ b/src/course-home/progress-tab/grades/course-grade/CurrentGradeTooltip.jsx
@@ -12,13 +12,11 @@ const CurrentGradeTooltip = ({ tooltipClassName }) => {
   const intl = useIntl();
   const courseId = useContextId();
 
+  const modelData = useModel('progress', courseId);
   const {
-    assignmentTypeGradeSummary,
-    courseGrade: {
-      isPassing,
-      percent,
-    },
-  } = useModel('progress', courseId);
+    assignmentTypeGradeSummary = [],
+    courseGrade: { isPassing, percent } = {},
+  } = modelData || { courseGrade: {} };
 
   const currentGrade = Number((percent * 100).toFixed(0));
 
diff --git a/src/course-home/progress-tab/grades/grade-summary/GradeSummary.jsx b/src/course-home/progress-tab/grades/grade-summary/GradeSummary.jsx
index 6066997a9f..28c4f5323e 100644
--- a/src/course-home/progress-tab/grades/grade-summary/GradeSummary.jsx
+++ b/src/course-home/progress-tab/grades/grade-summary/GradeSummary.jsx
@@ -10,8 +10,8 @@ const GradeSummary = () => {
   const courseId = useContextId();
 
   const {
-    assignmentTypeGradeSummary,
-  } = useModel('progress', courseId);
+    assignmentTypeGradeSummary = [],
+  } = useModel('progress', courseId) || {};
 
   const [allOfSomeAssignmentTypeIsLocked, setAllOfSomeAssignmentTypeIsLocked] = useState(false);