diff --git a/custom_components/teufel_raumfeld/media_player.py b/custom_components/teufel_raumfeld/media_player.py
index 3e49d5f..57e517a 100644
--- a/custom_components/teufel_raumfeld/media_player.py
+++ b/custom_components/teufel_raumfeld/media_player.py
@@ -22,10 +22,14 @@
     TRANSPORT_STATE_STOPPED,
     TRANSPORT_STATE_TRANSITIONING,
 )
+from homeassistant.components import media_source
 from homeassistant.components.media_player import (
     MediaPlayerDeviceClass,
     MediaPlayerEntity,
 )
+from homeassistant.components.media_player.browse_media import (
+    async_process_play_media_url,
+)
 from homeassistant.components.media_player.const import (
     ATTR_MEDIA_VOLUME_LEVEL,
     MEDIA_TYPE_MUSIC,
@@ -438,13 +442,22 @@ async def async_media_seek(self, position):
 
     async def async_play_media(self, media_type, media_id, **kwargs):
         """Play a piece of media."""
+        play_uri = None
         if self._raumfeld.rooms_are_valid(self._rooms):
             if media_type in SUPPORTED_MEDIA_TYPES:
+                log_debug("media_id=%s" % (media_id))
                 if media_type == MEDIA_TYPE_MUSIC:
                     if media_id.startswith("http"):
                         play_uri = media_id
+                    if media_id.startswith("media-source"):
+                        play_item = await media_source.async_resolve_media(
+                            self.hass, media_id
+                        )
+                        play_uri = async_process_play_media_url(
+                            self.hass, play_item.url
+                        )
                     else:
-                        log_error("Unexpected URI for media type: %s" % media_type)
+                        log_error("Unexpected media ID for media type: %s" % media_type)
                 elif media_type in [
                     UPNP_CLASS_ALBUM,
                     UPNP_CLASS_LINE_IN,
@@ -462,7 +475,12 @@ async def async_play_media(self, media_type, media_id, **kwargs):
                 if self.state == STATE_OFF:
                     await self.async_turn_on()
                 log_debug("self._rooms=%s, play_uri=%s" % (self._rooms, play_uri))
-                await self._raumfeld.async_set_av_transport_uri(self._rooms, play_uri)
+                if play_uri is None:
+                    log_error("URI to play could not be composed.")
+                else:
+                    await self._raumfeld.async_set_av_transport_uri(
+                        self._rooms, play_uri
+                    )
             else:
                 log_error("Playing of media type '%s' not supported" % media_type)
         else: