diff --git a/tidal_async/api.py b/tidal_async/api.py
index 25a4ca4..82d8d8e 100644
--- a/tidal_async/api.py
+++ b/tidal_async/api.py
@@ -228,12 +228,6 @@ async def subtitles(self) -> Optional[str]:
         return lyrics_dict["subtitles"]
 
     async def get_metadata(self):
-        # TODO [#22]: Rewrite Track.get_metadata
-        #   - [ ] lyrics
-        #   - [x] rewrite title parsing
-        #   - [x] replayGain
-        #   - [x] multiple artists
-        #   - [x] Tidal track URL
         album = self.album
         await album.reload_info()
 
@@ -271,6 +265,17 @@ async def get_metadata(self):
         if "upc" in album and album.upc:
             tags["barcode"] = album.upc
 
+        lyrics = await self.lyrics()
+        if lyrics:
+            tags["lyrics"] = lyrics
+
+        subtitles = await self.subtitles()
+        if subtitles:
+            # TODO: Support for subtitles tag
+            #   prelimitary invalid support for subtitles tag
+            #   depends on beetbox/mediafile#48
+            tags["subtitles"] = subtitles
+
         return tags