diff --git a/jellyfin/api_client.py b/jellyfin/api_client.py
index f679837..3b00ace 100644
--- a/jellyfin/api_client.py
+++ b/jellyfin/api_client.py
@@ -88,6 +88,11 @@ class JellyfinApiClient:
 
     def to_episode_model(self, item: dict) -> JellyfinMediaItem:
         media_id = item.get('Id')
+        seris_name = item.get('SeriesName')
+        season_number = item.get('ParentIndexNumber')
+        episode_number = item.get('IndexNumber')
+
+        subtitle=f"S{season_number:02}E{episode_number:02} of {seris_name}"
 
         return JellyfinMediaItem(
             id=media_id,
@@ -95,8 +100,6 @@ class JellyfinApiClient:
             type=JellyfinMediaType.EPISODE,
             image_url=self.get_image_url(media_id),
             metadata={
-                'series': item.get('SeriesName'),
-                'season': item.get('ParentIndexNumber'),
-                'episode': item.get('IndexNumber'),
+                'subtitle': subtitle,
             }
         )
diff --git a/jellyfin/utils.py b/jellyfin/utils.py
index bb8c7ed..01881df 100644
--- a/jellyfin/utils.py
+++ b/jellyfin/utils.py
@@ -22,16 +22,10 @@ def to_rpc_payload(media_item: JellyfinMediaItem) -> DiscordRPCUpdatePayload:
             activity_type=ActivityType.WATCHING
         )
     elif media_item.type == JellyfinMediaType.EPISODE:
-        series_name = media_item.metadata.get('series', 'Unknown Series')
-        season = media_item.metadata.get('season', '?')
-        episode = media_item.metadata.get('episode', '?')
-
-        subtitle = f"S{season:02}E{episode:02} of {series_name}"
-
         return DiscordRPCUpdatePayload(
             id=media_item.id,
             title=f"Watching {media_item.name}",
-            subtitle=subtitle,
+            subtitle=media_item.metadata.get('subtitle'),
             image_url=media_item.image_url,
             details=media_item.name,
             activity_type=ActivityType.WATCHING