diff --git a/frontend/src/pages/Courses.vue b/frontend/src/pages/Courses.vue
index c43ad88a..b55b5d60 100644
--- a/frontend/src/pages/Courses.vue
+++ b/frontend/src/pages/Courses.vue
@@ -29,7 +29,6 @@
 				class="flex flex-col space-y-2 lg:space-y-0 lg:flex-row lg:items-center lg:space-x-4"
 			>
 				<TabButtons
-					v-if="user.data"
 					:buttons="courseTabs"
 					v-model="currentTab"
 				/>
@@ -199,10 +198,6 @@ const updateCertificationFilter = () => {
 }
 
 const updateTabFilter = () => {
-	if (!user.data) {
-		return
-	}
-
 	delete filters.value['live']
 	delete filters.value['created']
 	delete filters.value['published_on']
@@ -295,7 +290,7 @@ const courseTabs = computed(() => {
 	]
 	if (user.data?.is_student) {
 		tabs.push({ label: __('Enrolled') })
-	} else {
+	} else if (user.data) {
 		tabs.push({ label: __('Created') })
 	}
 	return tabs