diff --git a/src/radio/lastfmservice.cpp b/src/radio/lastfmservice.cpp
index 42a49e7d8..dffc163b4 100644
--- a/src/radio/lastfmservice.cpp
+++ b/src/radio/lastfmservice.cpp
@@ -423,7 +423,9 @@ void LastFMService::NowPlaying(const Song &song) {
   if (!InitScrobbler())
     return;
 
-  last_track_ = TrackFromSong(song);
+  lastfm::MutableTrack mtrack(TrackFromSong(song));
+  mtrack.stamp();
+  last_track_ = mtrack;
 
   //check immediately if the song is valid
   Scrobble::Invalidity invalidity;
@@ -434,10 +436,6 @@ void LastFMService::NowPlaying(const Song &song) {
     return;
   }
 
-  lastfm::MutableTrack mtrack(last_track_);
-  mtrack.stamp();
-  last_track_ = mtrack;
-
   scrobbler_->nowPlaying(mtrack);
 }
 
diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
index 1189461bb..323add88d 100644
--- a/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@ -1062,7 +1062,7 @@ void MainWindow::UpdateTrackPosition() {
   // Update the tray icon every 10 seconds
   if (position % 10 == 0) {
     qDebug() << "position" << position << "scrobble point" << scrobble_point
-        << "has_scrobbled" << (playlists_->active()->get_lastfm_status() == Playlist::LastFM_Scrobbled);
+        << "status" << playlists_->active()->get_lastfm_status();
     tray_icon_->SetProgress(double(position) / length * 100);
 
     //if we're waiting for the scrobble point, update the icon