diff --git a/client/src/components/dueDates/DueDatesList.vue b/client/src/components/dueDates/DueDatesList.vue
index b1e662ea..4ba57f1f 100644
--- a/client/src/components/dueDates/DueDatesList.vue
+++ b/client/src/components/dueDates/DueDatesList.vue
@@ -1,23 +1,3 @@
-<template>
-  <div>
-    <ul>
-      <li
-        v-for="dueDate in dueDatesDisplayed"
-        :key="dueDate.id"
-        :class="{ 'first:border-t': props.showTopBorder, 'border-b': true }"
-      >
-        <DueDateSingle :due-date="dueDate"></DueDateSingle>
-      </li>
-    </ul>
-    <div v-if="allDueDates.length > props.maxCount" class="flex items-center pt-6">
-      <!--a href="">{{ $t("dueDates.showAllDueDates") }}</a-->
-      <it-icon-arrow-right />
-    </div>
-
-    <div v-if="allDueDates.length === 0">{{ $t("dueDates.noDueDatesAvailable") }}</div>
-  </div>
-</template>
-
 <script lang="ts" setup>
 import DueDateSingle from "@/components/dueDates/DueDateSingle.vue";
 import type { DueDate } from "@/types";
@@ -37,3 +17,23 @@ const dueDatesDisplayed = computed(() => {
   return props.dueDates.slice(0, props.maxCount);
 });
 </script>
+
+<template>
+  <div>
+    <ul>
+      <li
+        v-for="dueDate in dueDatesDisplayed"
+        :key="dueDate.id"
+        :class="{ 'first:border-t': props.showTopBorder, 'border-b': true }"
+      >
+        <DueDateSingle :due-date="dueDate"></DueDateSingle>
+      </li>
+    </ul>
+    <div v-if="allDueDates.length > props.maxCount" class="flex items-center pt-6">
+      <!--a href="">{{ $t("dueDates.showAllDueDates") }}</a-->
+      <it-icon-arrow-right />
+    </div>
+
+    <div v-if="allDueDates.length === 0">{{ $t("dueDates.noDueDatesAvailable") }}</div>
+  </div>
+</template>
diff --git a/client/src/stores/courseSessions.ts b/client/src/stores/courseSessions.ts
index 138a7b95..10e2a0da 100644
--- a/client/src/stores/courseSessions.ts
+++ b/client/src/stores/courseSessions.ts
@@ -209,8 +209,8 @@ export const useCourseSessionsStore = defineStore("courseSessions", () => {
 
   function sortDueDates(dueDates: DueDate[]) {
     dueDates.sort((a, b) => {
-      const dateA = dayjs(a.end);
-      const dateB = dayjs(b.end);
+      const dateA = dayjs(a.start);
+      const dateB = dayjs(b.start);
 
       if (!dateA.isValid() && !dateB.isValid()) return 0; // If both are invalid, they are equal
       if (!dateA.isValid()) return 1; // If dateA is invalid, it goes after dateB