diff --git a/context/albumview.cpp b/context/albumview.cpp
index 68ea8cb01..b78030c28 100644
--- a/context/albumview.cpp
+++ b/context/albumview.cpp
@@ -102,7 +102,7 @@ void AlbumView::refresh()
 
 void AlbumView::update(const Song &song, bool force)
 {
-    if (song.isEmpty()) {
+    if (song.isEmpty() || song.albumArtist().isEmpty() || song.album.isEmpty()) {
         currentSong=song;
         engine->cancel();
         clear();
diff --git a/context/artistview.cpp b/context/artistview.cpp
index 931492970..346d01a83 100644
--- a/context/artistview.cpp
+++ b/context/artistview.cpp
@@ -129,7 +129,7 @@ void ArtistView::refresh()
 
 void ArtistView::update(const Song &s, bool force)
 {
-    if (s.isEmpty()) {
+    if (s.isEmpty() || s.artist.isEmpty()) {
         currentSong=s;
         engine->cancel();
         clear();
diff --git a/context/songview.cpp b/context/songview.cpp
index 406094f98..14730d5ed 100644
--- a/context/songview.cpp
+++ b/context/songview.cpp
@@ -235,7 +235,7 @@ void SongView::update(const Song &s, bool force)
         return;
     }
 
-    if (s.isEmpty()) {
+    if (s.isEmpty() || s.title.isEmpty() || s.artist.isEmpty()) {
         currentSong=s;
         clear();
         return;