diff --git a/js/app/controllers/views/alltracksviewcontroller.js b/js/app/controllers/views/alltracksviewcontroller.js
index 31dbc97ac..672e10346 100644
--- a/js/app/controllers/views/alltracksviewcontroller.js
+++ b/js/app/controllers/views/alltracksviewcontroller.js
@@ -35,7 +35,7 @@ angular.module('Music').controller('AllTracksViewController', [
 			_.each(_unsubFuncs, function(func) { func(); });
 		});
 
-		function play(startIndex = 0) {
+		function play(startIndex = null) {
 			playlistService.setPlaylist('alltracks', _tracks, startIndex);
 			playlistService.publish('play');
 		}
diff --git a/js/app/controllers/views/playlistviewcontroller.js b/js/app/controllers/views/playlistviewcontroller.js
index ed379f75a..a354cc660 100644
--- a/js/app/controllers/views/playlistviewcontroller.js
+++ b/js/app/controllers/views/playlistviewcontroller.js
@@ -58,7 +58,7 @@ angular.module('Music').controller('PlaylistViewController', [
 			});
 		};
 
-		function play(startIndex = 0) {
+		function play(startIndex = null) {
 			let id = 'playlist-' + $scope.playlist.id;
 			playlistService.setPlaylist(id, $scope.tracks, startIndex);
 			playlistService.publish('play');
diff --git a/js/app/controllers/views/radioviewcontroller.js b/js/app/controllers/views/radioviewcontroller.js
index bd5c665a4..d421d698a 100644
--- a/js/app/controllers/views/radioviewcontroller.js
+++ b/js/app/controllers/views/radioviewcontroller.js
@@ -75,7 +75,7 @@ angular.module('Music').controller('RadioViewController', [
 			);
 		}
 
-		function play(startIndex = 0) {
+		function play(startIndex = null) {
 			playlistService.setPlaylist('radio', $scope.stations, startIndex);
 			playlistService.publish('play');
 		}