diff --git a/mopidy_musicbox_webclient/static/js/controls.js b/mopidy_musicbox_webclient/static/js/controls.js
index fda3a95..97decee 100644
--- a/mopidy_musicbox_webclient/static/js/controls.js
+++ b/mopidy_musicbox_webclient/static/js/controls.js
@@ -35,11 +35,10 @@ function playBrowsedTracks(addtoqueue, trackIndex) {
             mopidy.tracklist.add(browseTracks);
             break;
         case PLAY_ALL:
+            mopidy.tracklist.clear();
             // TODO: Use uris parameter in v1.0 API (faster?).
-            mopidy.tracklist.clear().then(function () {
-                mopidy.tracklist.add(browseTracks).then(function(tlTracks) {
-                    mopidy.playback.play(tlTracks[trackIndex]);
-                });
+            mopidy.tracklist.add(browseTracks).then(function(tlTracks) {
+                mopidy.playback.play(tlTracks[trackIndex]);
             });
             break;
         default: