diff --git a/src/playbin.vala b/src/playbin.vala
index 0b4819b..f1b87e1 100644
--- a/src/playbin.vala
+++ b/src/playbin.vala
@@ -124,6 +124,8 @@ class Playbin : GLib.Object {
                             } else {
                                 this.play_queue_position = (uint) data.parse_int64 ();
                                 debug (@"playlist-pos has been updated to $(this.play_queue_position)");
+                                this.song = (Subsonic.Song) this.play_queue.get_item (this.play_queue_position);
+                                this.now_playing ();
                             }
                             break;
 
@@ -135,10 +137,6 @@ class Playbin : GLib.Object {
 
                     case Mpv.EventId.START_FILE:
                         debug ("START_FILE received");
-                        if (this.play_queue_position < this.play_queue.get_n_items ()) {
-                            this.song = (Subsonic.Song) this.play_queue.get_item (this.play_queue_position);
-                            this.now_playing ();
-                        }
                         break;
 
                     case Mpv.EventId.END_FILE: