diff --git a/src/player.c b/src/player.c
index a5dee1ae..c9984ecd 100644
--- a/src/player.c
+++ b/src/player.c
@@ -987,6 +987,9 @@ event_play_start()
 {
   DPRINTF(E_DBG, L_PLAYER, "event_play_start()\n");
 
+  if (!pb_session.playing_now->prev)
+    outputs_metadata_send(pb_session.playing_now->item_id, true, metadata_finalize_cb);
+
   session_update_play_start();
 
   status_update(PLAY_PLAYING);
@@ -1899,8 +1902,6 @@ playback_start_bh(void *arg, int *retval)
   if (ret < 0)
     goto error;
 
-  outputs_metadata_send(pb_session.playing_now->item_id, true, metadata_finalize_cb);
-
   status_update(PLAY_PLAYING);
 
   *retval = 0;