diff --git a/lib/widgets/aves_app.dart b/lib/widgets/aves_app.dart
index f279c2984..055674ecb 100644
--- a/lib/widgets/aves_app.dart
+++ b/lib/widgets/aves_app.dart
@@ -631,7 +631,7 @@ class _AvesAppState extends State<AvesApp> with WidgetsBindingObserver {
       final shouldReset = _exitedMainByPop;
       _exitedMainByPop = false;
 
-      if (!shouldReset && (intentData ?? {}).isEmpty) {
+      if (!shouldReset && (intentData ?? {}).values.whereNotNull().isEmpty) {
         reportService.log('Relaunch');
         return;
       }
diff --git a/lib/widgets/home_page.dart b/lib/widgets/home_page.dart
index 5ec822745..f2d537a33 100644
--- a/lib/widgets/home_page.dart
+++ b/lib/widgets/home_page.dart
@@ -107,7 +107,7 @@ class _HomePageState extends State<HomePage> {
       unawaited(appInventory.initAppNames());
     }
 
-    if (intentData.isNotEmpty) {
+    if (intentData.values.whereNotNull().isNotEmpty) {
       await reportService.log('Intent data=$intentData');
       switch (intentAction) {
         case IntentActions.view: