diff --git a/src/app/CourseList.tsx b/src/app/CourseList.tsx
index 2ded6fe..910dc51 100644
--- a/src/app/CourseList.tsx
+++ b/src/app/CourseList.tsx
@@ -30,6 +30,7 @@ export default function CourseList() {
               <Link
                 href={getCourseUrl(settings.name)}
                 shallow={true}
+                prefetch={true}
                 className="
                   font-bold text-xl block
                   transition-all hover:scale-105 hover:underline hover:text-slate-200
diff --git a/src/app/course/[courseName]/CourseNavigation.tsx b/src/app/course/[courseName]/CourseNavigation.tsx
index 5f45130..443224c 100644
--- a/src/app/course/[courseName]/CourseNavigation.tsx
+++ b/src/app/course/[courseName]/CourseNavigation.tsx
@@ -1,10 +1,22 @@
 "use client";
 import { Spinner } from "@/components/Spinner";
-import { useCanvasAssignmentsQuery, canvasAssignmentKeys } from "@/features/canvas/hooks/canvasAssignmentHooks";
+import {
+  useCanvasAssignmentsQuery,
+  canvasAssignmentKeys,
+} from "@/features/canvas/hooks/canvasAssignmentHooks";
 import { canvasCourseKeys } from "@/features/canvas/hooks/canvasCourseHooks";
-import { useCanvasModulesQuery, canvasCourseModuleKeys } from "@/features/canvas/hooks/canvasModuleHooks";
-import { useCanvasPagesQuery, canvasPageKeys } from "@/features/canvas/hooks/canvasPageHooks";
-import { useCanvasQuizzesQuery, canvasQuizKeys } from "@/features/canvas/hooks/canvasQuizHooks";
+import {
+  useCanvasModulesQuery,
+  canvasCourseModuleKeys,
+} from "@/features/canvas/hooks/canvasModuleHooks";
+import {
+  useCanvasPagesQuery,
+  canvasPageKeys,
+} from "@/features/canvas/hooks/canvasPageHooks";
+import {
+  useCanvasQuizzesQuery,
+  canvasQuizKeys,
+} from "@/features/canvas/hooks/canvasQuizHooks";
 import { useLocalCourseSettingsQuery } from "@/features/local/course/localCoursesHooks";
 import { useQueryClient } from "@tanstack/react-query";
 import Link from "next/link";
diff --git a/src/app/course/[courseName]/lecture/[lectureDay]/EditLectureTitle.tsx b/src/app/course/[courseName]/lecture/[lectureDay]/EditLectureTitle.tsx
index f91eb23..5c4bff6 100644
--- a/src/app/course/[courseName]/lecture/[lectureDay]/EditLectureTitle.tsx
+++ b/src/app/course/[courseName]/lecture/[lectureDay]/EditLectureTitle.tsx
@@ -22,6 +22,7 @@ export default function EditLectureTitle({
           className="btn hidden sm:inline"
           href={getCourseUrl(courseName)}
           shallow={true}
+          prefetch={true}
         >
           {courseName}
         </Link>
diff --git a/src/app/course/[courseName]/modules/[moduleName]/assignment/[assignmentName]/EditAssignmentHeader.tsx b/src/app/course/[courseName]/modules/[moduleName]/assignment/[assignmentName]/EditAssignmentHeader.tsx
index 2ea5cb2..bf871ef 100644
--- a/src/app/course/[courseName]/modules/[moduleName]/assignment/[assignmentName]/EditAssignmentHeader.tsx
+++ b/src/app/course/[courseName]/modules/[moduleName]/assignment/[assignmentName]/EditAssignmentHeader.tsx
@@ -13,7 +13,12 @@ export default function EditAssignmentHeader({
   const { courseName } = useCourseContext();
   return (
     <div className="py-1 flex flex-row justify-start gap-3">
-      <Link className="btn" href={getCourseUrl(courseName)} shallow={true}>
+      <Link
+        className="btn"
+        href={getCourseUrl(courseName)}
+        shallow={true}
+        prefetch={true}
+      >
         {courseName}
       </Link>
       <UpdateAssignmentName
diff --git a/src/app/course/[courseName]/modules/[moduleName]/page/[pageName]/EditPageHeader.tsx b/src/app/course/[courseName]/modules/[moduleName]/page/[pageName]/EditPageHeader.tsx
index 3b765d4..8d91f7e 100644
--- a/src/app/course/[courseName]/modules/[moduleName]/page/[pageName]/EditPageHeader.tsx
+++ b/src/app/course/[courseName]/modules/[moduleName]/page/[pageName]/EditPageHeader.tsx
@@ -17,6 +17,7 @@ export default function EditPageHeader({
         className="btn"
         href={getCourseUrl(courseName)}
         shallow={true}
+        prefetch={true}
       >
         {courseName}
       </Link>
diff --git a/src/app/course/[courseName]/modules/[moduleName]/quiz/[quizName]/EditQuizHeader.tsx b/src/app/course/[courseName]/modules/[moduleName]/quiz/[quizName]/EditQuizHeader.tsx
index 0b0857e..612814f 100644
--- a/src/app/course/[courseName]/modules/[moduleName]/quiz/[quizName]/EditQuizHeader.tsx
+++ b/src/app/course/[courseName]/modules/[moduleName]/quiz/[quizName]/EditQuizHeader.tsx
@@ -17,6 +17,7 @@ export default function EditQuizHeader({
         className="btn"
         href={getCourseUrl(courseName)}
         shallow={true}
+        prefetch={true}
       >
         {courseName}
       </Link>
diff --git a/src/app/course/[courseName]/page.tsx b/src/app/course/[courseName]/page.tsx
index 8a2c422..fa83a67 100644
--- a/src/app/course/[courseName]/page.tsx
+++ b/src/app/course/[courseName]/page.tsx
@@ -3,7 +3,6 @@ import DraggingContextProvider from "./context/drag/DraggingContextProvider";
 import { CourseNavigation } from "./CourseNavigation";
 import { DragStyleContextProvider } from "./context/drag/dragStyleContext";
 import CollapsableSidebar from "./CollapsableSidebar";
-import { SuspenseAndErrorHandling } from "@/components/SuspenseAndErrorHandling";
 
 export default async function CoursePage() {
   return (
@@ -13,10 +12,8 @@ export default async function CoursePage() {
           <DraggingContextProvider>
             <div className="flex sm:flex-row h-full flex-col max-w-[2400px] w-full mx-auto">
               <div className="flex-1 h-full flex flex-col">
-                <SuspenseAndErrorHandling>
-                  <CourseNavigation />
-                  <CourseCalendar />
-                </SuspenseAndErrorHandling>
+                <CourseNavigation />
+                <CourseCalendar />
               </div>
               <CollapsableSidebar />
             </div>