diff --git a/nextjs/src/app/course/[courseName]/settings/AllSettings.tsx b/nextjs/src/app/course/[courseName]/settings/AllSettings.tsx
new file mode 100644
index 0000000..caa344f
--- /dev/null
+++ b/nextjs/src/app/course/[courseName]/settings/AllSettings.tsx
@@ -0,0 +1,28 @@
+"use client"
+
+import { useLocalCourseSettingsQuery } from "@/hooks/localCourse/localCoursesHooks";
+import AssignmentGroupManagement from "./AssignmentGroupManagement";
+import DaysOfWeekSettings from "./DaysOfWeekSettings";
+import DefaultDueTime from "./DefaultDueTime";
+import DefaultFileUploadTypes from "./DefaultFileUploadTypes";
+import HolidayConfig from "./HolidayConfig";
+import SettingsHeader from "./SettingsHeader";
+import StartAndEndDate from "./StartAndEndDate";
+import SubmissionDefaults from "./SubmissionDefaults";
+import { Fragment } from "react";
+
+export default function AllSettings() {
+  const [_, { dataUpdatedAt }] = useLocalCourseSettingsQuery();
+  return (
+    <Fragment key={dataUpdatedAt}>
+      <SettingsHeader />
+      <DaysOfWeekSettings />
+      <StartAndEndDate />
+      <SubmissionDefaults />
+      <DefaultFileUploadTypes />
+      <DefaultDueTime />
+      <AssignmentGroupManagement />
+      <HolidayConfig />
+    </Fragment>
+  );
+}
diff --git a/nextjs/src/app/course/[courseName]/settings/page.tsx b/nextjs/src/app/course/[courseName]/settings/page.tsx
index b04241b..6851ad5 100644
--- a/nextjs/src/app/course/[courseName]/settings/page.tsx
+++ b/nextjs/src/app/course/[courseName]/settings/page.tsx
@@ -1,24 +1,10 @@
-import StartAndEndDate from "./StartAndEndDate";
-import SettingsHeader from "./SettingsHeader";
-import DefaultDueTime from "./DefaultDueTime";
-import DaysOfWeekSettings from "./DaysOfWeekSettings";
-import AssignmentGroupManagement from "./AssignmentGroupManagement";
-import SubmissionDefaults from "./SubmissionDefaults";
-import DefaultFileUploadTypes from "./DefaultFileUploadTypes";
-import HolidayConfig from "./HolidayConfig";
+import AllSettings from "./AllSettings";
 
 export default function page() {
   return (
     <div className="flex justify-center h-full overflow-auto pt-5  ">
       <div className=" w-fit ">
-        <SettingsHeader />
-        <DaysOfWeekSettings />
-        <StartAndEndDate />
-        <SubmissionDefaults />
-        <DefaultFileUploadTypes />
-        <DefaultDueTime />
-        <AssignmentGroupManagement />
-        <HolidayConfig />
+        <AllSettings />
         <br />
         <br />
         <br />
diff --git a/nextjs/src/app/realtime/ClientCacheInvalidation.tsx b/nextjs/src/app/realtime/ClientCacheInvalidation.tsx
index 2eb961b..1f7a17f 100644
--- a/nextjs/src/app/realtime/ClientCacheInvalidation.tsx
+++ b/nextjs/src/app/realtime/ClientCacheInvalidation.tsx
@@ -34,7 +34,7 @@ export function ClientCacheInvalidation() {
       const [courseName, moduleOrLectures, itemType, itemFile] =
         filePath.split("/");
 
-      const itemName = removeFileExtension(itemFile);
+      const itemName = itemFile ? removeFileExtension(itemFile) : undefined;
 
       const allParts = [courseName, moduleOrLectures, itemType, itemName];