diff --git a/apps/settings/src/components/AppList.vue b/apps/settings/src/components/AppList.vue
index 72bf1abd162d0..7b0347302cc7d 100644
--- a/apps/settings/src/components/AppList.vue
+++ b/apps/settings/src/components/AppList.vue
@@ -14,7 +14,7 @@
 			<template v-if="useListView">
 				<div v-if="showUpdateAll" class="apps-list__toolbar">
 					{{ n('settings', '%n app has an update available', '%n apps have an update available', counter) }}
-					<NcButton v-if="showUpdateAll"
+					<NcButton
 						id="app-list-update-all"
 						type="primary"
 						@click="updateAll">
@@ -22,7 +22,7 @@
 					</NcButton>
 				</div>
 
-				<div v-if="!showUpdateAll" class="apps-list__toolbar">
+				<div v-else-if="!loading" class="apps-list__toolbar">
 					{{ t('settings', 'All apps are up-to-date.') }}
 				</div>