diff --git a/Projects/Features/BaseFeature/Sources/Etc/PlayState/PlayState+Playlist.swift b/Projects/Features/BaseFeature/Sources/Etc/PlayState/PlayState+Playlist.swift
index cf85ac66b..1bef4fcf0 100644
--- a/Projects/Features/BaseFeature/Sources/Etc/PlayState/PlayState+Playlist.swift
+++ b/Projects/Features/BaseFeature/Sources/Etc/PlayState/PlayState+Playlist.swift
@@ -42,6 +42,7 @@ final class Playlist {
     }
 
     func remove(at index: Int) {
+        guard list[safe: index] != nil else { return }
         list.remove(at: index)
     }