diff --git a/frontend/src/app/Catalog/Class/index.tsx b/frontend/src/app/Catalog/Class/index.tsx
index a85ba5791..48e331291 100644
--- a/frontend/src/app/Catalog/Class/index.tsx
+++ b/frontend/src/app/Catalog/Class/index.tsx
@@ -52,7 +52,7 @@ const views = [
 ];
 
 interface ClassProps {
-  partialCurrentCourse: ICourse | null;
+  partialCurrentCourse: ICourse;
   currentSemester: Semester;
   currentYear: number;
   currentClassNumber: string;
@@ -87,9 +87,9 @@ export default function Class({
 
   const partialCurrentClass = useMemo(
     () =>
-      partialCurrentCourse?.classes.find(
+      partialCurrentCourse.classes.find(
         (class_) => class_.number === currentClassNumber
-      ),
+      ) as IClass,
     [partialCurrentCourse, currentClassNumber]
   );
 
diff --git a/frontend/src/app/Catalog/index.tsx b/frontend/src/app/Catalog/index.tsx
index 5e08f5425..8322de0d2 100644
--- a/frontend/src/app/Catalog/index.tsx
+++ b/frontend/src/app/Catalog/index.tsx
@@ -60,7 +60,7 @@ export default function Catalog() {
       />
       {currentClassNumber && currentCourseNumber && currentSubject ? (
         <Class
-          partialCurrentCourse={partialCurrentCourse}
+          partialCurrentCourse={partialCurrentCourse ?? ({} as ICourse)}
           currentSemester={currentSemester}
           currentYear={currentYear}
           currentClassNumber={currentClassNumber!}