diff --git a/frontend/src/pages/TermPlanner/TermPlanner.tsx b/frontend/src/pages/TermPlanner/TermPlanner.tsx
index 2cb3e08f1..165e50bfa 100644
--- a/frontend/src/pages/TermPlanner/TermPlanner.tsx
+++ b/frontend/src/pages/TermPlanner/TermPlanner.tsx
@@ -48,7 +48,11 @@ const extrapolateCourseYears = (
 
   validYears.forEach((year) => {
     if (newData[year]) bestYear = year;
-    else newData[year] = { ...newData[bestYear], terms: [] };
+    else
+      newData[year] = {
+        ...newData[bestYear],
+        terms: year > LIVE_YEAR ? newData[LIVE_YEAR].terms : []
+      };
   });
 
   return newData;
@@ -374,7 +378,10 @@ const TermPlanner = () => {
                 <UnplannedColumn
                   dragging={!!draggingCourse}
                   courseInfos={Object.fromEntries(
-                    planner.unplanned.map((code) => [code, courseInfos[LIVE_YEAR][code]])
+                    planner.unplanned.map((code) => [
+                      code,
+                      courseInfos[Math.min(validYears.at(-1)!, LIVE_YEAR)][code]
+                    ])
                   )}
                   validateInfos={validations.courses_state}
                 />