diff --git a/src/js/HuesCore.js b/src/js/HuesCore.js
index fe63bcb..8e1d6e8 100644
--- a/src/js/HuesCore.js
+++ b/src/js/HuesCore.js
@@ -624,6 +624,9 @@ class HuesCore {
 
     doAutoSong() {
         let func = null;
+        if(this.resourceManager.enabledSongs.length < 2) {
+            return; // don't move if there's nothing to move to
+        }
         if(localStorage["autoSongShuffle"] == "on") {
             func = this.randomSong;
         } else {