diff --git a/lib/provider/audio_player/audio_player.dart b/lib/provider/audio_player/audio_player.dart
index da22b2ce..5323f3c0 100644
--- a/lib/provider/audio_player/audio_player.dart
+++ b/lib/provider/audio_player/audio_player.dart
@@ -287,6 +287,10 @@ class AudioPlayerNotifier extends Notifier<AudioPlayerState> {
       await ref.read(sourcedTrackProvider(intendedActiveTrack).future);
     }
 
+    if(medias.isEmpty) return;
+
+    await removeCollections(state.collections);
+
     await audioPlayer.openPlaylist(
       medias,
       initialIndex: initialIndex,
diff --git a/lib/provider/authentication/authentication.dart b/lib/provider/authentication/authentication.dart
index 08e658e8..f7339ef0 100644
--- a/lib/provider/authentication/authentication.dart
+++ b/lib/provider/authentication/authentication.dart
@@ -97,7 +97,7 @@ class AuthenticationNotifier extends AsyncNotifier<AuthenticationTableData?> {
 
     await database
         .into(database.authenticationTable)
-        .insert(refreshedCredentials);
+        .insertOnConflictUpdate(refreshedCredentials);
   }
 
   Future<AuthenticationTableCompanion> credentialsFromCookie(