diff --git a/app/lib/widget/home_photos/bloc.dart b/app/lib/widget/home_photos/bloc.dart
index a2e1e4a6..7492d59e 100644
--- a/app/lib/widget/home_photos/bloc.dart
+++ b/app/lib/widget/home_photos/bloc.dart
@@ -385,6 +385,7 @@ _ItemTransformerResult _buildItem(_ItemTransformerArgument arg) {
         )
       : null;
 
+  final tzOffset = clock.now().timeZoneOffset;
   final transformed = <_Item>[];
   for (int i = 0; i < sortedFiles.length; ++i) {
     final file = sortedFiles[i];
@@ -392,12 +393,13 @@ _ItemTransformerResult _buildItem(_ItemTransformerArgument arg) {
     if (item == null) {
       continue;
     }
-    final date = dateHelper?.onFile(file);
+    final localDate = file.fdDateTime.add(tzOffset);
+    final date = dateHelper?.onFile(file, localDate: localDate);
     if (date != null) {
       transformed.add(_DateItem(date: date, isMonthOnly: !arg.isGroupByDay));
     }
     transformed.add(item);
-    memoryCollectionHelper?.addFile(file);
+    memoryCollectionHelper?.addFile(file, localDate: localDate);
   }
   final memoryCollections = memoryCollectionHelper
       ?.build((year) => L10n.of(arg.locale).memoryAlbumName(today.year - year));
diff --git a/app/lib/widget/photo_list_util.dart b/app/lib/widget/photo_list_util.dart
index bf71a50c..f8b9335b 100644
--- a/app/lib/widget/photo_list_util.dart
+++ b/app/lib/widget/photo_list_util.dart
@@ -15,15 +15,20 @@ part 'photo_list_util.g.dart';
 class DateGroupHelper {
   DateGroupHelper({
     required this.isMonthOnly,
-  });
+  }) : _tzOffset = clock.now().timeZoneOffset;
 
-  DateTime? onFile(FileDescriptor file) {
-    final newDate = file.fdDateTime.toLocal();
-    if (newDate.year != _currentDate?.year ||
-        newDate.month != _currentDate?.month ||
-        (!isMonthOnly && newDate.day != _currentDate?.day)) {
-      _currentDate = newDate;
-      return newDate;
+  DateTime? onFile(
+    FileDescriptor file, {
+    DateTime? localDate,
+  }) {
+    // toLocal is way too slow
+    // final localDate = file.fdDateTime.toLocal();
+    localDate ??= file.fdDateTime.add(_tzOffset);
+    if (localDate.year != _currentDate?.year ||
+        localDate.month != _currentDate?.month ||
+        (!isMonthOnly && localDate.day != _currentDate?.day)) {
+      _currentDate = localDate;
+      return localDate;
     } else {
       return null;
     }
@@ -31,6 +36,7 @@ class DateGroupHelper {
 
   final bool isMonthOnly;
   DateTime? _currentDate;
+  final Duration _tzOffset;
 }
 
 /// Build memory collection from files
@@ -42,20 +48,33 @@ class MemoryCollectionHelper {
     this.account, {
     DateTime? today,
     required int dayRange,
-  })  : today = (today?.toLocal() ?? clock.now()).toMidnight(),
-        dayRange = math.max(dayRange, 0);
+  })  : _tzOffset = clock.now().timeZoneOffset,
+        // today = (today?.toLocal() ?? clock.now()).toMidnight(),
+        dayRange = math.max(dayRange, 0) {
+    this.today = (today ?? clock.now()).toUtc().add(_tzOffset).toMidnight();
+  }
 
-  void addFile(FileDescriptor f) {
-    final date = f.fdDateTime.toLocal().toMidnight();
-    final diff = today.difference(date).inDays;
+  void addFile(
+    FileDescriptor f, {
+    DateTime? localDate,
+  }) {
+    // too slow
+    // final localDate = f.fdDateTime.toLocal().toMidnight();
+    localDate = (localDate ?? f.fdDateTime.add(_tzOffset)).toMidnight();
+    final diff = today.difference(localDate).inDays;
     if (diff < 300) {
       return;
     }
     for (final dy in [0, -1, 1]) {
-      if (today.copyWith(year: date.year + dy).difference(date).abs().inDays <=
+      if (today
+              .copyWith(year: localDate.year + dy)
+              .difference(localDate)
+              .abs()
+              .inDays <=
           dayRange) {
-        _log.fine("[addFile] Add file (${f.fdDateTime}) to ${date.year + dy}");
-        _addFileToYear(f, date.year + dy);
+        _log.fine(
+            "[addFile] Add file (${f.fdDateTime}) to ${localDate.year + dy}");
+        _addFileToYear(f, localDate.year + dy);
         break;
       }
     }
@@ -96,8 +115,9 @@ class MemoryCollectionHelper {
   }
 
   final Account account;
-  final DateTime today;
+  late final DateTime today;
   final int dayRange;
+  final Duration _tzOffset;
   final _data = <int, _MemoryCollectionHelperItem>{};
 }