diff --git a/ChangeLog b/ChangeLog
index a47e01942..9b6665cd9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -36,6 +36,8 @@
 20. Fix drag'n'drop of non-loaded playlists.
 21. Use a single-shot timer to timeout obtaining current cover.
 22. Fix AudioCD playback when MPD's curl is using IPv6
+23. Fix current track display when chaging from one track with no meta-data to
+    another with no meta-data.
 
 2.0.0
 -----
diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
index 0053b4276..eee130be6 100644
--- a/gui/mainwindow.cpp
+++ b/gui/mainwindow.cpp
@@ -1688,7 +1688,7 @@ void MainWindow::updateCurrentSong(Song song, bool wasEmpty)
     if (song.isCdda()) {
         emit getStatus();
         if (song.isUnknownAlbum()) {
-            Song pqSong=PlayQueueModel::self()->getSongById(current.id);
+            Song pqSong=PlayQueueModel::self()->getSongById(song    .id);
             if (!pqSong.isEmpty()) {
                 song=pqSong;
             }
diff --git a/mpd-interface/song.h b/mpd-interface/song.h
index 0dc99272f..d74f09106 100644
--- a/mpd-interface/song.h
+++ b/mpd-interface/song.h
@@ -135,7 +135,7 @@ struct Song
     int compareTo(const Song &o) const;
     virtual ~Song() { }
     bool isEmpty() const;
-    bool isDifferent(const Song &s) const { return year!=s.year || artist!=s.artist || album!=s.album || title!=s.title || name()!=s.name(); }
+    bool isDifferent(const Song &s) const { return file!=s.file || year!=s.year || artist!=s.artist || album!=s.album || title!=s.title || name()!=s.name(); }
     void guessTags();
     void revertGuessedTags();
     void fillEmptyFields();