diff --git a/src/mprisinterface.cpp b/src/mprisinterface.cpp
index 91fcca625f472d2d8247771625101aa1358432ec..1bfd18c30e592228eee4b390b955b714b4a72f7b 100644
--- a/src/mprisinterface.cpp
+++ b/src/mprisinterface.cpp
@@ -100,10 +100,17 @@ void MPRISPlayerInterface::mediaVolumeChanged(int volume)
 
 void MPRISPlayerInterface::mediaPlaylistChanged(QStringList playlist)
 {
-    emit metadataChanged(Metadata());
-    QVariantMap map;
-    map.insert("Metadata",Metadata());
-    dbusUpdate(map);
+    if(playlist.size() > 0)
+    {
+        emit metadataChanged(Metadata());
+        QVariantMap map;
+        map.insert("Metadata",Metadata());
+        dbusUpdate(map);
+    }
+    else
+    {
+        mediaStateChanged(false);
+    }
 }
 
 bool MPRISPlayerInterface::CanControl()