diff --git a/src/courseware/CoursewareContainer.jsx b/src/courseware/CoursewareContainer.jsx
index 7da50f18..809e7de6 100644
--- a/src/courseware/CoursewareContainer.jsx
+++ b/src/courseware/CoursewareContainer.jsx
@@ -270,11 +270,11 @@ class CoursewareContainer extends Component {
     // This helps process old URLS that still use a blocks usage key in the URL.
     let updatedSequenceId;
     let updatedUnitId;
-    if (sequence) {
-      if (sequenceId.includes('block') && shortLinkFeatureFlag) {
+    if (shortLinkFeatureFlag) {
+      if (sequence && sequenceId.includes('block')) {
         updatedSequenceId = sequence.id;
       }
-      if (routeUnitId.includes('block') && shortLinkFeatureFlag) {
+      if (routeUnitId && routeUnitId.includes('block')) {
         updatedUnitId = sequence.unitIds[sequence.activeUnitIndex];
       }
     }