diff --git a/src/App.vue b/src/App.vue
index c27ffad44..e463a7903 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -122,6 +122,7 @@
 				</div>
 			</div>
 		</div>
+		<!-- FIXME: This will only be triggered when the root component is already loaded before doing link share auth. Will "fix" itself once we use vuex. -->
 		<div v-else-if="user.authenticated && user.infos.type === authTypes.LINK_SHARE">
 			<div class="container has-text-centered link-share-view">
 				<div class="column is-10 is-offset-1">
diff --git a/src/components/lists/ShowList.vue b/src/components/lists/ShowList.vue
index a8220fb5f..ef24f3981 100644
--- a/src/components/lists/ShowList.vue
+++ b/src/components/lists/ShowList.vue
@@ -26,6 +26,7 @@
 
 	import ListModel from '../../models/list'
 	import ListService from '../../services/list'
+	import authType from '../../models/authTypes'
 
 	export default {
 		data() {
@@ -41,12 +42,12 @@
 		},
 		beforeMount() {
 			// Check if the user is already logged in, if so, redirect him to the homepage
-			if (!auth.user.authenticated && !auth.user.isLinkShareAuth) {
+			if (!auth.user.authenticated && auth.user.infos.type !== authType.LINK_SHARE) {
 				router.push({name: 'home'})
 			}
 
 			// If the type is invalid, redirect the user
-			if (this.$route.params.type !== 'gantt' && this.$route.params.type !== '') {
+			if (auth.user.authenticated && auth.user.infos.type !== authType.LINK_SHARE && this.$route.params.type !== 'gantt' && this.$route.params.type !== '') {
 				router.push({name: 'showList', params: { id:  this.$route.params.id }})
 			}
 		},
diff --git a/src/components/tasks/ShowListTasks.vue b/src/components/tasks/ShowListTasks.vue
index 955fc7c66..a58c1bd44 100644
--- a/src/components/tasks/ShowListTasks.vue
+++ b/src/components/tasks/ShowListTasks.vue
@@ -83,8 +83,6 @@
 </template>
 
 <script>
-	import auth from '../../auth'
-	import router from '../../router'
 	import message from '../../message'
 
 	import ListService from '../../services/list'
@@ -121,12 +119,6 @@
 				this.list = this.theList
 			}
 		},
-		beforeMount() {
-			// Check if the user is already logged in, if so, redirect him to the homepage
-			if (!auth.user.authenticated) {
-				router.push({name: 'home'})
-			}
-		},
 		created() {
 			this.listService = new ListService()
 			this.taskService = new TaskService()