diff --git a/src/components/FilesListViewer.vue b/src/components/FilesListViewer.vue
index abad1015a..7954c8d75 100644
--- a/src/components/FilesListViewer.vue
+++ b/src/components/FilesListViewer.vue
@@ -21,7 +21,7 @@
  -->
 <template>
 	<div class="files-list-viewer">
-		<NcEmptyContent v-if="emptyMessage !== '' && itemsBySections.length === 1 && itemsBySections[0].items.length === 0 && !loading"
+		<NcEmptyContent v-if="emptyMessage !== '' && photosCount === 0 && !loading"
 			key="emptycontent"
 			:name="emptyMessage">
 			<PackageVariant slot="icon" />
@@ -215,6 +215,10 @@ export default {
 			return []
 		},
 
+		photosCount() {
+			return this.itemsBySections.map(({ items }) => items.length).reduce((total, length) => total + length, 0)
+		},
+
 		/** @return {boolean} The list of items to pass to TiledLayout. */
 		showLoader() {
 			return this.loading && (this.fileIds?.length !== 0 || this.sections?.length !== 0)
diff --git a/src/views/Timeline.vue b/src/views/Timeline.vue
index d26daf256..c33e9d807 100644
--- a/src/views/Timeline.vue
+++ b/src/views/Timeline.vue
@@ -24,8 +24,9 @@
 
 <template>
 	<!-- Errors handlers -->
-	<NcEmptyContent v-if="errorFetchingFiles">
-		{{ t('photos', 'An error occurred') }}
+	<NcEmptyContent v-if="errorFetchingFiles" :name="t('photos', 'An error occurred')">
+		<AlertCircle slot="icon" />
+		<span v-if="errorFetchingFiles === 404" slot="description">{{ t('photos', 'The source folder does not exists') }}</span>
 	</NcEmptyContent>
 
 	<div v-else class="timeline">
@@ -150,6 +151,7 @@ import Delete from 'vue-material-design-icons/Delete.vue'
 import PlusBoxMultiple from 'vue-material-design-icons/PlusBoxMultiple.vue'
 import Download from 'vue-material-design-icons/Download.vue'
 import Close from 'vue-material-design-icons/Close.vue'
+import AlertCircle from 'vue-material-design-icons/AlertCircle.vue'
 
 import { NcModal, NcActions, NcActionButton, NcButton, NcEmptyContent, isMobile } from '@nextcloud/vue'
 import moment from '@nextcloud/moment'
@@ -189,6 +191,7 @@ export default {
 		ActionFavorite,
 		ActionDownload,
 		HeaderNavigation,
+		AlertCircle,
 	},
 
 	filters: {