diff --git a/apps/frontend/src/pages/[type]/[id].vue b/apps/frontend/src/pages/[type]/[id].vue
index f21eacc99..763bca362 100644
--- a/apps/frontend/src/pages/[type]/[id].vue
+++ b/apps/frontend/src/pages/[type]/[id].vue
@@ -2274,9 +2274,9 @@ const hasEditDetailsPermission = computed(() => {
 })
 
 watch(
-	[isSettings, currentMember],
+	[isSettings, allMembers, canAccessSettings],
 	() => {
-		if (isSettings.value && !canAccessSettings.value) {
+		if (isSettings.value && allMembers.value.length > 0 && !canAccessSettings.value) {
 			showError({
 				fatal: true,
 				statusCode: 401,
diff --git a/apps/frontend/src/pages/organization/[id].vue b/apps/frontend/src/pages/organization/[id].vue
index 5206f4c12..362c9227c 100644
--- a/apps/frontend/src/pages/organization/[id].vue
+++ b/apps/frontend/src/pages/organization/[id].vue
@@ -532,9 +532,9 @@ provideOrganizationContext(organizationContext)
 const canAccessSettings = computed(() => !!currentMember.value?.accepted)
 
 watch(
-	[routeHasSettings, currentMember],
+	[routeHasSettings, acceptedMembers, currentMember],
 	() => {
-		if (routeHasSettings.value && !canAccessSettings.value) {
+		if (routeHasSettings.value && acceptedMembers.value.length > 0 && !canAccessSettings.value) {
 			showError({
 				fatal: true,
 				statusCode: 401,