diff --git a/frontend/src/composables/useRouteWithModal.ts b/frontend/src/composables/useRouteWithModal.ts
index fd5ad58ea..9fc4605ff 100644
--- a/frontend/src/composables/useRouteWithModal.ts
+++ b/frontend/src/composables/useRouteWithModal.ts
@@ -6,7 +6,7 @@ import {useProjectStore} from '@/stores/projects'
 export function useRouteWithModal() {
 	const router = useRouter()
 	const route = useRoute()
-	const backdropView = computed(() => route.fullPath ? window.history.state.backdropView : undefined)
+	const backdropView = computed(() => route.fullPath ? window.history.state?.backdropView : undefined)
 	const baseStore = useBaseStore()
 	const projectStore = useProjectStore()
 
diff --git a/frontend/src/views/tasks/TaskDetailView.vue b/frontend/src/views/tasks/TaskDetailView.vue
index e60c02829..12831f67e 100644
--- a/frontend/src/views/tasks/TaskDetailView.vue
+++ b/frontend/src/views/tasks/TaskDetailView.vue
@@ -28,7 +28,7 @@
 					:key="p.id"
 				>
 					<a
-						v-if="router.options.history.state.back?.includes('/projects/'+p.id+'/') || false"
+						v-if="router.options.history.state?.back?.includes('/projects/'+p.id+'/') || false"
 						v-shortcut="p.id === project?.id ? 'u' : ''"
 						@click="router.back()"
 					>