diff --git a/lib/controller/audio_handler.dart b/lib/controller/audio_handler.dart
index 3281b28a..47a49fc2 100644
--- a/lib/controller/audio_handler.dart
+++ b/lib/controller/audio_handler.dart
@@ -498,9 +498,8 @@ class NamidaAudioVideoHandler<Q extends Playable> extends BasicAudioHandler<Q> {
         tr.toAudioSource(currentIndex, currentQueue.length),
         startPlaying: startPlaying,
       );
-      if (tr.duration == 0) {
-        tr.duration = dur?.inSeconds ?? 0;
-      }
+      Indexer.inst.updateTrackDuration(tr, dur);
+
       refreshNotification(currentItem);
     }
 
diff --git a/lib/controller/indexer_controller.dart b/lib/controller/indexer_controller.dart
index e93af03f..6d4ac705 100644
--- a/lib/controller/indexer_controller.dart
+++ b/lib/controller/indexer_controller.dart
@@ -1008,6 +1008,14 @@ class Indexer {
     await File(AppPaths.TRACKS).writeAsJson(tracksInfoList.map((key) => allTracksMappedByPath[key]?.toJson()).toList());
   }
 
+  Future<void> updateTrackDuration(Track track, Duration? dur) async {
+    final durInSeconds = dur?.inSeconds ?? 0;
+    if (track.duration == 0 && durInSeconds > 0) {
+      track.duration = durInSeconds;
+    }
+    await _saveTrackFileToStorage();
+  }
+
   /// Returns new [TrackStats].
   Future<TrackStats> updateTrackStats(
     Track track, {