diff --git a/server/routes/dashboard.js b/server/routes/dashboard.js
index a78d575..596c712 100644
--- a/server/routes/dashboard.js
+++ b/server/routes/dashboard.js
@@ -97,10 +97,11 @@ function getRadarrLink(movie) {
 // Extract episode info from a Sonarr queue/history record.
 // Returns { season, episode, title } or null if data is missing.
 function extractEpisode(record) {
-  const s = record.seasonNumber;
-  const e = record.episodeNumber;
+  const ep = record.episode || {};
+  const s = ep.seasonNumber != null ? ep.seasonNumber : record.seasonNumber;
+  const e = ep.episodeNumber != null ? ep.episodeNumber : record.episodeNumber;
   if (s == null || e == null) return null;
-  const title = record.episode && record.episode.title ? record.episode.title : null;
+  const title = ep.title || null;
   return { season: s, episode: e, title };
 }
 
diff --git a/server/routes/history.js b/server/routes/history.js
index aeb1dfb..a4c6a0f 100644
--- a/server/routes/history.js
+++ b/server/routes/history.js
@@ -84,10 +84,11 @@ function buildTagBadges(allTags, embyUserMap) {
 
 // Extract episode info from a Sonarr history record.
 function extractEpisode(record) {
-  const s = record.seasonNumber;
-  const e = record.episodeNumber;
+  const ep = record.episode || {};
+  const s = ep.seasonNumber != null ? ep.seasonNumber : record.seasonNumber;
+  const e = ep.episodeNumber != null ? ep.episodeNumber : record.episodeNumber;
   if (s == null || e == null) return null;
-  const title = record.episode && record.episode.title ? record.episode.title : null;
+  const title = ep.title || null;
   return { season: s, episode: e, title };
 }