diff --git a/custom_components/mass/media_player.py b/custom_components/mass/media_player.py
index 9970373d..1c18982a 100644
--- a/custom_components/mass/media_player.py
+++ b/custom_components/mass/media_player.py
@@ -216,12 +216,13 @@ async def async_on_update(self) -> None:
             self._attr_media_position_updated_at = from_utc_timestamp(
                 queue.elapsed_time_last_updated
             )
+            self._prev_time = queue.elapsed_time
         else:
             self._attr_media_position = player.elapsed_time
             self._attr_media_position_updated_at = from_utc_timestamp(
                 player.elapsed_time_last_updated
             )
-        self._prev_time = queue.elapsed_time
+            self._prev_time = player.elapsed_time
         self._update_media_image_url(queue)
         # update current media item infos
         media_artist = None