diff --git a/client/src/components/ui/ItModal.vue b/client/src/components/ui/ItModal.vue
index cc8cafc6..b1f89d42 100644
--- a/client/src/components/ui/ItModal.vue
+++ b/client/src/components/ui/ItModal.vue
@@ -18,7 +18,7 @@ function setIsOpen(value: boolean) {
 </script>
 
 <template>
-  <Dialog :open="modelValue" @close="setIsOpen" class="relative z-50">
+  <Dialog :open="modelValue" class="relative z-50" @close="setIsOpen">
     <div class="fixed inset-0 bg-black/30" aria-hidden="true"></div>
     <div class="fixed inset-0 flex items-center justify-center p-4">
       <DialogPanel class="w-full max-w-2xl bg-white px-8 pt-8 pb-4">
diff --git a/client/src/pages/cockpit/CockpitUserProfilePage.vue b/client/src/pages/cockpit/CockpitUserProfilePage.vue
index 751f807a..a9cbf1c3 100644
--- a/client/src/pages/cockpit/CockpitUserProfilePage.vue
+++ b/client/src/pages/cockpit/CockpitUserProfilePage.vue
@@ -86,8 +86,8 @@ function setActiveClasses(isActive: boolean) {
         </ul>
         <div>
           <ul
-            class="px-8 bg-white"
             v-if="competenceStore.competenceProfilePage(user.user_id)"
+            class="px-8 bg-white"
           >
             <li
               v-for="competence in competenceStore.competences(user.user_id)"
diff --git a/client/src/stores/cockpit.ts b/client/src/stores/cockpit.ts
index 52ac3c74..00d5d849 100644
--- a/client/src/stores/cockpit.ts
+++ b/client/src/stores/cockpit.ts
@@ -36,7 +36,7 @@ export const useCockpitStore = defineStore({
       this.courseSessionUsers = data.users;
       this.cockpitSessionUser = data.cockpit_user;
 
-      if (this.cockpitSessionUser.circles?.length > 0) {
+      if (this.cockpitSessionUser && this.cockpitSessionUser.circles?.length > 0) {
         this.selectedCircles = [this.cockpitSessionUser.circles[0].id];
       }
 
diff --git a/client/src/stores/courseSessions.ts b/client/src/stores/courseSessions.ts
index 956f9d0d..e2126a41 100644
--- a/client/src/stores/courseSessions.ts
+++ b/client/src/stores/courseSessions.ts
@@ -34,7 +34,8 @@ export const useCourseSessionsStore = defineStore({
     hasCockpit() {
       const userStore = useUserStore();
       return (
-        this.courseSessionForRoute.experts.filter(
+        this.courseSessionForRoute &&
+        (this.courseSessionForRoute as unknown as CourseSession).experts.filter(
           (expert) => expert.user_id === userStore.id
         ).length > 0
       );