diff --git a/desktop/src/zero1hd/rhythmbullet/desktop/audio/MusicListController.java b/desktop/src/zero1hd/rhythmbullet/desktop/audio/MusicListController.java
index 0e6043c..6f047b6 100755
--- a/desktop/src/zero1hd/rhythmbullet/desktop/audio/MusicListController.java
+++ b/desktop/src/zero1hd/rhythmbullet/desktop/audio/MusicListController.java
@@ -126,9 +126,9 @@ public class MusicListController extends Observable implements OnCompletionListe
 			mm.dispose();
 		}
 		if (currentPlaybackID < 0) {
-			currentPlaybackID = musicList.getTotal();
+			currentPlaybackID = musicList.getTotal()-1;
 		}
-		if (currentPlaybackID > musicList.getTotal()) {
+		if (currentPlaybackID >= musicList.getTotal()) {
 			currentPlaybackID = 0;
 		}
 		this.mm = musicList.getMusicInfoFromIndex(currentPlaybackID);