diff --git a/lib/services/sourced_track/sources/jiosaavn.dart b/lib/services/sourced_track/sources/jiosaavn.dart
index 865e3d63..1434e4f7 100644
--- a/lib/services/sourced_track/sources/jiosaavn.dart
+++ b/lib/services/sourced_track/sources/jiosaavn.dart
@@ -43,7 +43,12 @@ class JioSaavnSourcedTrack extends SourcedTrack {
   }) async {
     final database = ref.read(databaseProvider);
     final cachedSource = await (database.select(database.sourceMatchTable)
-          ..where((s) => s.trackId.equals(track.id!)))
+          ..where((s) => s.trackId.equals(track.id!))
+          ..limit(1)
+          ..orderBy([
+            (s) =>
+                OrderingTerm(expression: s.createdAt, mode: OrderingMode.desc),
+          ]))
         .getSingleOrNull();
 
     if (cachedSource == null ||
@@ -215,7 +220,11 @@ class JioSaavnSourcedTrack extends SourcedTrack {
             trackId: id!,
             sourceId: info.id,
             sourceType: const Value(SourceType.jiosaavn),
+            // Because we're sorting by createdAt in the query
+            // we have to update it to indicate priority
+            createdAt: Value(DateTime.now()),
           ),
+          mode: InsertMode.replace,
         );
 
     return JioSaavnSourcedTrack(
diff --git a/lib/services/sourced_track/sources/piped.dart b/lib/services/sourced_track/sources/piped.dart
index d156b26e..d24f110f 100644
--- a/lib/services/sourced_track/sources/piped.dart
+++ b/lib/services/sourced_track/sources/piped.dart
@@ -52,7 +52,12 @@ class PipedSourcedTrack extends SourcedTrack {
   }) async {
     final database = ref.read(databaseProvider);
     final cachedSource = await (database.select(database.sourceMatchTable)
-          ..where((s) => s.trackId.equals(track.id!)))
+          ..where((s) => s.trackId.equals(track.id!))
+          ..limit(1)
+          ..orderBy([
+            (s) =>
+                OrderingTerm(expression: s.createdAt, mode: OrderingMode.desc),
+          ]))
         .getSingleOrNull();
     final preferences = ref.read(userPreferencesProvider);
     final pipedClient = ref.read(pipedProvider);
@@ -278,7 +283,11 @@ class PipedSourcedTrack extends SourcedTrack {
             trackId: id!,
             sourceId: newSourceInfo.id,
             sourceType: const Value(SourceType.youtube),
+            // Because we're sorting by createdAt in the query
+            // we have to update it to indicate priority
+            createdAt: Value(DateTime.now()),
           ),
+          mode: InsertMode.replace,
         );
 
     return PipedSourcedTrack(
diff --git a/lib/services/sourced_track/sources/youtube.dart b/lib/services/sourced_track/sources/youtube.dart
index 0501a499..0b5ee71b 100644
--- a/lib/services/sourced_track/sources/youtube.dart
+++ b/lib/services/sourced_track/sources/youtube.dart
@@ -50,8 +50,14 @@ class YoutubeSourcedTrack extends SourcedTrack {
   }) async {
     final database = ref.read(databaseProvider);
     final cachedSource = await (database.select(database.sourceMatchTable)
-          ..where((s) => s.trackId.equals(track.id!)))
-        .getSingleOrNull();
+          ..where((s) => s.trackId.equals(track.id!))
+          ..limit(1)
+          ..orderBy([
+            (s) =>
+                OrderingTerm(expression: s.createdAt, mode: OrderingMode.desc),
+          ]))
+        .get()
+        .then((s) => s.firstOrNull);
 
     if (cachedSource == null || cachedSource.sourceType != SourceType.youtube) {
       final siblings = await fetchSiblings(ref: ref, track: track);
@@ -287,12 +293,17 @@ class YoutubeSourcedTrack extends SourcedTrack {
         );
 
     final database = ref.read(databaseProvider);
+
     await database.into(database.sourceMatchTable).insert(
           SourceMatchTableCompanion.insert(
             trackId: id!,
             sourceId: newSourceInfo.id,
             sourceType: const Value(SourceType.youtube),
+            // Because we're sorting by createdAt in the query
+            // we have to update it to indicate priority
+            createdAt: Value(DateTime.now()),
           ),
+          mode: InsertMode.replace,
         );
 
     return YoutubeSourcedTrack(