diff --git a/lib/widgets/aves_app.dart b/lib/widgets/aves_app.dart
index 159eb6d05..7abe47c43 100644
--- a/lib/widgets/aves_app.dart
+++ b/lib/widgets/aves_app.dart
@@ -619,14 +619,6 @@ class _AvesAppState extends State<AvesApp> with WidgetsBindingObserver {
   }
 
   void _onNewIntent(Map? intentData) {
-    debugPrint('$runtimeType onNewIntent with intentData=$intentData');
-
-    // do not reset when relaunching the app
-    if (_appModeNotifier.value == AppMode.main && (intentData == null || intentData.isEmpty == true)) {
-      reportService.log('Relaunch');
-      return;
-    }
-
     reportService.log('New intent data=$intentData');
     _navigatorKey.currentState!.pushReplacement(DirectMaterialPageRoute(
       settings: const RouteSettings(name: HomePage.routeName),
diff --git a/lib/widgets/home_page.dart b/lib/widgets/home_page.dart
index 5af70b362..969aca967 100644
--- a/lib/widgets/home_page.dart
+++ b/lib/widgets/home_page.dart
@@ -195,10 +195,12 @@ class _HomePageState extends State<HomePage> {
         unawaited(GlobalSearch.registerCallback());
         unawaited(AnalysisService.registerCallback());
         final source = context.read<CollectionSource>();
-        await source.init(
-          loadTopEntriesFirst: settings.homePage == HomePageSetting.collection && settings.homeCustomCollection.isEmpty,
-          canAnalyze: !safeMode,
-        );
+        if (source.initState != SourceInitializationState.full) {
+          await source.init(
+            loadTopEntriesFirst: settings.homePage == HomePageSetting.collection && settings.homeCustomCollection.isEmpty,
+            canAnalyze: !safeMode,
+          );
+        }
       case AppMode.screenSaver:
         final source = context.read<CollectionSource>();
         await source.init(