diff --git a/lib/provider/download_manager_provider.dart b/lib/provider/download_manager_provider.dart
index 691a1385..dc538938 100644
--- a/lib/provider/download_manager_provider.dart
+++ b/lib/provider/download_manager_provider.dart
@@ -25,7 +25,7 @@ class DownloadManagerProvider extends ChangeNotifier {
       final (:request, :status) = event;
 
       final track = $history.firstWhereOrNull(
-        (element) => element.url == request.url,
+        (element) => element.getUrlOfCodec(downloadCodec) == request.url,
       );
       if (track == null) return;
 
diff --git a/lib/utils/type_conversion_utils.dart b/lib/utils/type_conversion_utils.dart
index a805272c..662b611c 100644
--- a/lib/utils/type_conversion_utils.dart
+++ b/lib/utils/type_conversion_utils.dart
@@ -147,7 +147,7 @@ abstract class TypeConversionUtils {
     track.name = metadata?.title ?? basenameWithoutExtension(file.path);
     track.type = "track";
     track.uri = file.path;
-    track.durationMs = (metadata?.durationMs?.toInt() ?? 0) * 1000;
+    track.durationMs = (metadata?.durationMs?.toInt() ?? 0);
 
     return track;
   }