diff --git a/src/courseware/course/Course.jsx b/src/courseware/course/Course.jsx
index 55aceb17..bd396290 100644
--- a/src/courseware/course/Course.jsx
+++ b/src/courseware/course/Course.jsx
@@ -32,7 +32,6 @@ function Course({
   const course = useModel('courses', courseId);
   const sequence = useModel('sequences', sequenceId);
   const section = useModel('sections', sequence ? sequence.sectionId : null);
-  const unit = useModel('units', unitId);
 
   useLogistrationAlert();
   useEnrollmentAlert(courseId);
@@ -60,7 +59,7 @@ function Course({
         />
         {isStaff && (
         <InstructorToolbar
-          unitId={unit.id}
+          unitId={unitId}
         />
         )}
         <CourseTabsNavigation tabs={tabs} activeTabSlug="courseware" />
diff --git a/src/courseware/course/InstructorToolbar.jsx b/src/courseware/course/InstructorToolbar.jsx
index e18dd739..7b3ddb84 100644
--- a/src/courseware/course/InstructorToolbar.jsx
+++ b/src/courseware/course/InstructorToolbar.jsx
@@ -53,7 +53,7 @@ const mapStateToProps = (state, props) => {
 
   const activeUnit = state.models.units[props.unitId];
   return {
-    activeUnitLmsWebUrl: activeUnit.lmsWebUrl,
+    activeUnitLmsWebUrl: activeUnit ? activeUnit.lmsWebUrl : undefined,
   };
 };