diff --git a/lib/ui/archive_page.dart b/lib/ui/archive_page.dart
index 24a0bf7d3..32dd3b2d6 100644
--- a/lib/ui/archive_page.dart
+++ b/lib/ui/archive_page.dart
@@ -32,12 +32,14 @@ class ArchivePage extends StatelessWidget {
             visibility: kVisibilityArchive, limit: limit, asc: asc);
       },
       reloadEvent: Bus.instance.on<FilesUpdatedEvent>().where((event) =>
-      event.updatedFiles
-              .firstWhere((element) => element.uploadedFileID != null) !=
+      event.updatedFiles.firstWhere(
+              (element) => element.uploadedFileID != null,
+              orElse: () => null) !=
           null),
       forceReloadEvent: Bus.instance.on<FilesUpdatedEvent>().where((event) =>
-      event.updatedFiles
-          .firstWhere((element) => element.uploadedFileID != null) !=
+          event.updatedFiles.firstWhere(
+              (element) => element.uploadedFileID != null,
+              orElse: () => null) !=
           null),
       tagPrefix: tagPrefix,
       selectedFiles: _selectedFiles,