diff --git a/src/core/player.cpp b/src/core/player.cpp
index ffffff431..052b867dd 100644
--- a/src/core/player.cpp
+++ b/src/core/player.cpp
@@ -589,9 +589,6 @@ void Player::PlayAt(const int index, Engine::TrackChangeFlags change, const Play
   }
   else {
     qLog(Debug) << "Playing song" << current_item_->Metadata().title() << url;
-    if (current_item_->HasTemporaryMetadata()) {
-      app_->playlist_manager()->active()->InformOfCurrentSongChange(autoscroll);
-    }
     engine_->Play(url, current_item_->Url(), change, current_item_->Metadata().has_cue(), current_item_->effective_beginning_nanosec(), current_item_->effective_end_nanosec());
   }
 
diff --git a/src/playlist/playlist.cpp b/src/playlist/playlist.cpp
index 140728c83..9857e5112 100644
--- a/src/playlist/playlist.cpp
+++ b/src/playlist/playlist.cpp
@@ -597,6 +597,7 @@ void Playlist::set_current_row(const int i, const AutoScroll autoscroll, const b
   QModelIndex old_current_item_index = current_item_index_;
 
   ClearStreamMetadata();
+  nowplaying_ = false;
 
   if (next_row() != -1 && next_row() != i) {
     PlaylistItemPtr next_item = item_at(next_row());
@@ -1613,6 +1614,7 @@ void Playlist::SetStreamMetadata(const QUrl &url, const Song &song, const bool m
   }
   else {
     update_scrobble_point = true;
+    nowplaying_ = false;
     InformOfCurrentSongChange(AutoScroll_Never);
   }
 
@@ -2145,7 +2147,6 @@ void Playlist::UpdateScrobblePoint(const qint64 seek_point_nanosec) {
     }
   }
 
-  nowplaying_ = false;
   scrobbled_ = false;
 
 }