diff --git a/app/statemachine.js b/app/statemachine.js
index 0be15a5fa..fceb19bee 100755
--- a/app/statemachine.js
+++ b/app/statemachine.js
@@ -1384,10 +1384,11 @@ CoreStateMachine.prototype.setRepeat = function (value, repeatSingle) {
     }
   } else {
     this.currentRepeat = value;
-
-    if (repeatSingle != undefined) {
-      this.currentRepeatSingleSong = repeatSingle;
-    }
+	if(this.currentRepeat && repeatSingle != undefined) {
+		this.currentRepeatSingleSong = repeatSingle;	
+	} else {
+		this.currentRepeatSingleSong = false;
+	}
 
     this.pushState().fail(this.pushError.bind(this));
   }