diff --git a/frontend/src/stores/base.ts b/frontend/src/stores/base.ts
index 052fdacdf..877c72e71 100644
--- a/frontend/src/stores/base.ts
+++ b/frontend/src/stores/base.ts
@@ -137,6 +137,12 @@ export const useBaseStore = defineStore('base', () => {
 		setCurrentProject(project, currentProjectViewId)
 	}
 
+	async function handleSetCurrentProjectIfNotSet(project: IProject) {
+		if (currentProject.value?.id !== project.id) {
+			await handleSetCurrentProject({project})
+		}
+	}
+
 	async function loadApp() {
 		try {
 			await checkAndSetApiUrl(window.API_URL)
@@ -184,6 +190,7 @@ export const useBaseStore = defineStore('base', () => {
 		setUpdateAvailable,
 
 		handleSetCurrentProject,
+		handleSetCurrentProjectIfNotSet,
 
 		...useMenuActive(),
 	}
diff --git a/frontend/src/views/tasks/TaskDetailView.vue b/frontend/src/views/tasks/TaskDetailView.vue
index 12831f67e..04ae0d3fe 100644
--- a/frontend/src/views/tasks/TaskDetailView.vue
+++ b/frontend/src/views/tasks/TaskDetailView.vue
@@ -745,7 +745,7 @@ watch(
 			setActiveFields()
 
 			if (project.value) {
-				await baseStore.handleSetCurrentProject({project: project.value})
+				await baseStore.handleSetCurrentProjectIfNotSet(project.value)
 			}
 		} catch (e) {
 			if (e?.response?.status === 404) {