diff --git a/mobile/lib/services/home_widget_service.dart b/mobile/lib/services/home_widget_service.dart
index 16fdb8c6f6..4b1717181d 100644
--- a/mobile/lib/services/home_widget_service.dart
+++ b/mobile/lib/services/home_widget_service.dart
@@ -11,6 +11,7 @@ import "package:photos/core/constants.dart";
 import "package:photos/models/file/file.dart";
 import "package:photos/services/memory_home_widget_service.dart";
 import "package:photos/services/smart_memories_service.dart";
+import "package:photos/services/sync/local_sync_service.dart";
 import "package:photos/utils/thumbnail_util.dart";
 import "package:shared_preferences/shared_preferences.dart";
 
@@ -38,6 +39,13 @@ class HomeWidgetService {
       return;
     }
 
+    final hasCompletedFirstImport =
+        LocalSyncService.instance.hasCompletedFirstImport();
+    if (!hasCompletedFirstImport) {
+      _logger.warning("first import not completed");
+      return;
+    }
+
     await MemoryHomeWidgetService.instance.initMemoryHW(null);
   }
 
diff --git a/mobile/lib/services/memory_home_widget_service.dart b/mobile/lib/services/memory_home_widget_service.dart
index f6e36a0273..1e750abb42 100644
--- a/mobile/lib/services/memory_home_widget_service.dart
+++ b/mobile/lib/services/memory_home_widget_service.dart
@@ -183,6 +183,9 @@ class MemoryHomeWidgetService {
       return;
     }
 
+    final total = await _getTotal();
+    _logger.info(">>> Total memories before: $total");
+
     int index = 0;
 
     for (final i in files.entries) {
@@ -212,7 +215,9 @@ class MemoryHomeWidgetService {
       return;
     }
 
-    await _updateWidget(text: ">>> Switching to next memory set");
+    await _updateWidget(
+      text: ">>> Switching to next memory set, total: $index",
+    );
   }
 
   Future<void> onLaunchFromWidget(int generatedId, BuildContext context) async {
diff --git a/mobile/lib/ui/settings/gallery_settings_screen.dart b/mobile/lib/ui/settings/gallery_settings_screen.dart
index 5496014111..fc8a8a705a 100644
--- a/mobile/lib/ui/settings/gallery_settings_screen.dart
+++ b/mobile/lib/ui/settings/gallery_settings_screen.dart
@@ -5,7 +5,7 @@ import "package:photos/core/event_bus.dart";
 import "package:photos/events/hide_shared_items_from_home_gallery_event.dart";
 import "package:photos/generated/l10n.dart";
 import "package:photos/service_locator.dart";
-import "package:photos/services/home_widget_service.dart";
+import "package:photos/services/memory_home_widget_service.dart";
 import "package:photos/theme/ente_theme.dart";
 import "package:photos/ui/components/buttons/icon_button_widget.dart";
 import "package:photos/ui/components/captioned_text_widget.dart";
@@ -109,7 +109,8 @@ class _GallerySettingsScreenState extends State<GallerySettingsScreen> {
                               ),
                             );
                             unawaited(
-                              HomeWidgetService.instance.initHomeWidget(),
+                              MemoryHomeWidgetService.instance
+                                  .initMemoryHW(true),
                             );
                           },
                         ),