diff --git a/src/js/helpers.js b/src/js/helpers.js
index 6e4b0f8d..cb942dab 100755
--- a/src/js/helpers.js
+++ b/src/js/helpers.js
@@ -173,6 +173,10 @@ export let getTrackIcon = function(current_track = false, core = false){
  **/
 export let formatTracks = function(tracks){
 
+	if (!tracks || tracks === undefined){
+		return null;
+	}
+
 	// Handle single recoreds
 	var singular = false;
 	if (tracks.constructor !== Array){
diff --git a/src/js/services/core/reducer.js b/src/js/services/core/reducer.js
index 68e34366..03c9cfb5 100755
--- a/src/js/services/core/reducer.js
+++ b/src/js/services/core/reducer.js
@@ -28,10 +28,9 @@ export default function reducer(core = {}, action){
 
                 var track = Object.assign(
                     {}, 
-                    tltrack.track,
+                    tltrack,
                     metadata,
-                    { 
-                        tlid: tltrack.tlid,
+                    {
                         playing: (core.current_track && tltrack.tlid == core.current_track.tlid )
                     })
                 tracklist.push(track)