diff --git a/audio/player.py b/audio/player.py
index a337cbe..10f9010 100644
--- a/audio/player.py
+++ b/audio/player.py
@@ -47,7 +47,10 @@ class Player(bass.BassPlayer):
         if track := db.user.Table.find("Previous").next_track():
             self.play_track(track, add_prev=False)
         else:
-            self.play_track(self.playlist.next_track())
+            if (track := self.playlist.next_track()) == None:
+                self.set_playlist(db.user.Table.find("Collection"))
+                track = self.playlist.next_track()
+            self.play_track(track)
 
     def previous(self):
         if track := db.user.Table.find("Previous").previous_track():