diff --git a/src/pages/timetable/TimetablePage.tsx b/src/pages/timetable/TimetablePage.tsx
index a55b012..40f5ed7 100644
--- a/src/pages/timetable/TimetablePage.tsx
+++ b/src/pages/timetable/TimetablePage.tsx
@@ -14,19 +14,19 @@ const TimetablePage: React.FC = () => {
     currentLessons,
     timetableDetailLoading,
     timetableDetailError,
-    fetchTimetableDetail,
+    fetchTimetable,
     deleteTimetable,
     clearCurrentTimetable,
   } = useTimetableStore();
 
   useEffect(() => {
     if (timetableId) {
-      fetchTimetableDetail(timetableId);
+      fetchTimetable(timetableId);
     }
     return () => {
       clearCurrentTimetable();
     };
-  }, [timetableId, fetchTimetableDetail, clearCurrentTimetable]);
+  }, [timetableId, fetchTimetable, clearCurrentTimetable]);
 
   const handleDeleteTimetable = async () => {
     if (!timetableId) return;
@@ -37,7 +37,7 @@ const TimetablePage: React.FC = () => {
   };
 
   // Group lessons by day
-  const lessonsByDay = currentLessons.reduce((acc, lesson) => {
+  const lessonsByDay = (currentLessons || []).reduce((acc, lesson) => {
     const date = lesson.day_of_week || format(parseISO(lesson.start_time), 'yyyy-MM-dd');
     if (!acc[date]) acc[date] = [];
     acc[date].push(lesson);