diff --git a/app/scripts/background.js b/app/scripts/background.js
index 4ca94b9..37feb14 100644
--- a/app/scripts/background.js
+++ b/app/scripts/background.js
@@ -232,7 +232,7 @@ Player.prototype = {
 
         if (this.state.shuffle) {
 
-            nextIndex = Utils.random(0, this.trackIds.length - 1);
+            nextIndex = Utils.random(0, this.trackIds.length);
 
         } else {