diff --git a/src/js/views/Queue.js b/src/js/views/Queue.js
index 2f7b4d42..151b0755 100755
--- a/src/js/views/Queue.js
+++ b/src/js/views/Queue.js
@@ -118,7 +118,6 @@ class Queue extends React.Component{
 							playing: (this.props.current_track && this.props.current_track.tlid == track.tlid)
 						}
 					);
-					tracks[i] = track;
 				}
 
 				// Siphon off this track if it's a full representation of our current track (by tlid)
diff --git a/src/js/views/Track.js b/src/js/views/Track.js
index c714034c..a0dcde1b 100755
--- a/src/js/views/Track.js
+++ b/src/js/views/Track.js
@@ -15,6 +15,7 @@ import LastfmLoveButton from '../components/LastfmLoveButton'
 import Dater from '../components/Dater'
 import LazyLoadListener from '../components/LazyLoadListener'
 import ContextMenuTrigger from '../components/ContextMenuTrigger'
+import URILink from '../components/URILink'
 
 import * as helpers from '../helpers'
 import * as uiActions from '../services/ui/actions'
@@ -212,7 +213,9 @@ class Track extends React.Component{
 					uiActions={this.props.uiActions} /> : null}
 
 				<div className="thumbnail-wrapper">
-					<Thumbnail size="large" canZoom images={track.album.images} />
+					<URILink type="album" uri={track.album.uri}>
+						<Thumbnail size="large" canZoom images={track.images} />
+					</URILink>
 				</div>
 
 				<div className="title">