diff --git a/src/components/Gradebook/index.jsx b/src/components/Gradebook/index.jsx
index 1531fc3..aebc4d9 100644
--- a/src/components/Gradebook/index.jsx
+++ b/src/components/Gradebook/index.jsx
@@ -568,7 +568,7 @@ Gradebook.defaultProps = {
   bulkImportError: '',
   showBulkManagement: false,
   bulkManagementHistory: [],
-  errorFetchingGradeOverrideHistory: '',
+  errorFetchingGradeOverrideHistory: false,
 };
 
 Gradebook.propTypes = {
@@ -628,7 +628,7 @@ Gradebook.propTypes = {
   gradeExportUrl: PropTypes.string.isRequired,
   submitFileUploadFormData: PropTypes.func.isRequired,
   bulkImportError: PropTypes.string,
-  errorFetchingGradeOverrideHistory: PropTypes.string,
+  errorFetchingGradeOverrideHistory: PropTypes.bool,
   showBulkManagement: PropTypes.bool,
   bulkManagementHistory: PropTypes.arrayOf(PropTypes.shape({
     operation: PropTypes.oneOf(['commit', 'error']),
diff --git a/src/data/actions/grades.js b/src/data/actions/grades.js
index 8edeb77..fed6170 100644
--- a/src/data/actions/grades.js
+++ b/src/data/actions/grades.js
@@ -130,10 +130,11 @@ const fetchGradeOverrideHistory = (subsectionId, userId) => (
       .then((data) => {
         dispatch(gotGradeOverrideHistory({
           overrideHistory: formatGradeOverrideForDisplay(data.history),
-          currentEarnedAllOverride: data.override.earned_all_override,
-          currentPossibleAllOverride: data.override.possible_all_override,
-          currentEarnedGradedOverride: data.override.earned_graded_override,
-          currentPossibleGradedOverride: data.override.possible_graded_override,
+          currentEarnedAllOverride: data.override ? data.override.earned_all_override : null,
+          currentPossibleAllOverride: data.override ? data.override.possible_all_override : null,
+          currentEarnedGradedOverride: data.override ? data.override.earned_graded_override : null,
+          currentPossibleGradedOverride: data.override ?
+            data.override.possible_graded_override : null,
         }));
       })
       .catch(() => {
diff --git a/src/data/reducers/grades.js b/src/data/reducers/grades.js
index 4eab724..f44d158 100644
--- a/src/data/reducers/grades.js
+++ b/src/data/reducers/grades.js
@@ -58,6 +58,7 @@ const grades = (state = initialState, action) => {
         gradeOverrideCurrentPossibleAllOverride: action.currentPossibleAllOverride,
         gradeOverrideCurrentEarnedGradedOverride: action.currentEarnedGradedOverride,
         gradeOverrideCurrentPossibleGradedOverride: action.currentPossibleGradedOverride,
+        errorFetchingOverrideHistory: false,
       };
 
     case ERROR_FETCHING_GRADE_OVERRIDE_HISTORY: