diff --git a/src/stores/base.ts b/src/stores/base.ts
index 71274de66..258d74667 100644
--- a/src/stores/base.ts
+++ b/src/stores/base.ts
@@ -81,7 +81,7 @@ export const useBaseStore = defineStore('base', () => {
 	async function handleSetCurrentProject(
 		{project, forceUpdate = false}: {project: IProject | null, forceUpdate?: boolean},
 	) {
-		if (project === null) {
+		if (project === null || typeof project === 'undefined') {
 			setCurrentProject({})
 			setBackground('')
 			setBlurHash('')
diff --git a/src/views/tasks/TaskDetailView.vue b/src/views/tasks/TaskDetailView.vue
index c6992ce51..239fe6eb6 100644
--- a/src/views/tasks/TaskDetailView.vue
+++ b/src/views/tasks/TaskDetailView.vue
@@ -18,7 +18,7 @@
 					<router-link :to="{ name: 'project.index', params: { projectId: p.id } }">
 						{{ getProjectTitle(p) }}
 					</router-link>
-					<span class="has-text-grey-light" v-if="p.id !== project.id"> &gt; </span>
+					<span class="has-text-grey-light" v-if="p.id !== project?.id"> &gt; </span>
 				</template>
 			</h6>
 
@@ -539,7 +539,7 @@ const visible = ref(false)
 
 const taskId = toRef(props, 'taskId')
 
-const project = computed(() => task.projectId ? projectStore.projects[task.projectId] : null)
+const project = computed(() => projectStore.projects[task.projectId])
 watchEffect(() => {
 	baseStore.handleSetCurrentProject({
 		project: project.value,