diff --git a/src/views/list/views/List.vue b/src/views/list/views/List.vue
index aba20f2e7..639f73e65 100644
--- a/src/views/list/views/List.vue
+++ b/src/views/list/views/List.vue
@@ -83,7 +83,7 @@
 			</p>
 		</div>
 
-		<p class="has-text-centered has-text-grey" v-if="tasks.length === 0">
+		<p class="has-text-centered has-text-grey" v-if="ctaVisiable && tasks.length === 0 && !taskCollectionService.loading">
 			This list is currently empty.
 			<a @click="$refs.newTaskInput.focus()">Create a new task.</a>
 		</p>
@@ -184,6 +184,8 @@ export default {
 			showError: false,
 			labelTaskService: LabelTaskService,
 			labelService: LabelService,
+
+			ctaVisible: false,
 		}
 	},
 	mixins: [
@@ -207,6 +209,9 @@ export default {
 		canWrite: state => state.currentList.maxRight > Rights.READ,
 		list: state => state.currentList,
 	}),
+	mounted() {
+		this.$nextTick(() => this.ctaVisible = true)
+	},
 	methods: {
 		// This function initializes the tasks page and loads the first page of tasks
 		initTasks(page, search = '') {
diff --git a/src/views/teams/ListTeams.vue b/src/views/teams/ListTeams.vue
index 24736ab1a..657e377a4 100644
--- a/src/views/teams/ListTeams.vue
+++ b/src/views/teams/ListTeams.vue
@@ -16,7 +16,7 @@
 				</router-link>
 			</li>
 		</ul>
-		<p v-else class="has-text-centered has-text-grey">
+		<p v-else-if="!teamService.loading" class="has-text-centered has-text-grey">
 			You are currently not part of any teams.
 			<router-link :to="{name: 'teams.create'}">
 				Create a new team.