diff --git a/FModel/ViewModels/AudioPlayerViewModel.cs b/FModel/ViewModels/AudioPlayerViewModel.cs
index 1409e9f6..70d33ffc 100644
--- a/FModel/ViewModels/AudioPlayerViewModel.cs
+++ b/FModel/ViewModels/AudioPlayerViewModel.cs
@@ -283,6 +283,13 @@ public class AudioPlayerViewModel : ViewModel, ISource, IDisposable
         if (_audioFiles.Count < 1) return;
         Application.Current.Dispatcher.Invoke(() =>
         {
+            var removedPlaying = false;
+            if (PlayedFile.Id == SelectedAudioFile.Id)
+            {
+                removedPlaying = true;
+                Stop();
+            }
+
             _audioFiles.RemoveAt(SelectedAudioFile.Id);
             for (var i = 0; i < _audioFiles.Count; i++)
             {